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

Android 4.3 release 2.1

Conflicts:
	src/com/android/providers/media/MediaProvider.java

Change-Id: Ibc669b40cb9cbd49fca9260b7f6ad42bec7fdb69

Conflicts:
	AndroidManifest.xml
	src/com/android/providers/media/MediaProvider.java