Merge changes Ib1274847,I2eb2a1bf into klp-dev

* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.

core/java/android/net/IConnectivityManager.aidl

@@ -93,12 +93,6 @@ interface IConnectivityManager
 
     String[] getTetheredIfaces();
 
-    /**
-     * Return list of interface pairs that are actively tethered.  Even indexes are
-     * remote interface, and odd indexes are corresponding local interfaces.
-     */
-    String[] getTetheredIfacePairs();
-
     String[] getTetheringErroredIfaces();
 
     String[] getTetherableUsbRegexs();