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

Android 4.3 Release 3.1

Conflicts:
	services/java/com/android/server/ConnectivityService.java