Merge tag 'android-4.3_r2.1' into jellybean-4.3

Android 4.3 release 2.1

Conflicts:
	Android.mk