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

Android 4.3 release 2.1

Conflicts:
	Android.mk
	AndroidManifest.xml
	src/com/android/gallery3d/filtershow/FilterShowActivity.java
	src/com/android/gallery3d/filtershow/ui/ImageCurves.java

Change-Id: I8e29f03fbb5de003e97f7180e287661bd9142a97