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

Android 4.3 release 2.1

Conflicts:
	include/telephony/ril.h

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