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

Android 4.3 release 2.1

Conflicts:
	Android.mk

Change-Id: I614e2625c0a791174ea26199dceb635f0a4682d4
Merge remote-tracking branch 'cm/cm-10.2' into HEAD