Merge tag 'android-4.3.1_r1' into HEAD

Android 4.3.1 Release 1

Conflicts:
	res/values/strings.xml

Change-Id: I44ce0c01a6a884b07b2dc849e4c22734df4d39e4

Conflicts:
	src/com/android/settings/WirelessSettings.java