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

Android 4.3 release 2.1

Conflicts:
	res/values-cs/strings.xml

Change-Id: Idceee08cb4d6f69e4f8cc4c043142852ac932e7f