Merge tag 'android-4.3_r3' into jb3

Android 4.3 release 3.0

Conflicts:
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java