Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	res/values-de/strings.xml

Change-Id: I3b2279d2a671cfc0b21dac6e0e67ba7c13cbb838