Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/base into cm-10.2

Android 4.3 Release 3.1

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/IConnectivityManager.aidl
	docs/html/about/versions/android-4.3.jd
	docs/html/develop/index.jd
	docs/html/distribute/googleplay/spotlight/index.jd
	docs/html/index.jd
	docs/html/sdk/index.jd
	docs/html/tools/revisions/platforms.jd
	docs/html/tools/sdk/ndk/index.jd