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

Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	res/layout/alarm_time.xml
	res/values-es/strings.xml
	res/values-iw/strings.xml
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/Utils.java

Change-Id: I07bc60f6ebcaf3738552bfdb3b6c5ed21216755d