Merge tag 'android-4.3_r2.1' into 'jb-mr2'

Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	proguard.flags
	res/layout/preference_dialog_brightness.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-hu/strings.xml
	res/values-ja/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-sv/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/wifi_advanced_settings.xml
	src/com/android/settings/BrightnessPreference.java
	src/com/android/settings/DevelopmentSettings.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/Settings.java
	src/com/android/settings/SoundSettings.java
	src/com/android/settings/WirelessSettings.java
	src/com/android/settings/deviceinfo/Memory.java
	src/com/android/settings/deviceinfo/MiscFilesHandler.java
	src/com/android/settings/deviceinfo/UsbSettings.java
	src/com/android/settings/wifi/AccessPoint.java

Change-Id: I0c3bf2c3619fda5edb0db18ce81447a4389c86ef

Conflicts:
	AndroidManifest.xml
	proguard.flags
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-ja/strings.xml
	res/values-pl/strings.xml
	res/values-ru/strings.xml
	res/values-sv/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml