Merge tag 'android-4.3_r3.1' into jb43

Android 4.3 Release 3.1

Conflicts:
	telephony/java/com/android/internal/telephony/DctConstants.java