Merge tag 'android-4.3_r3' into cm-10.2

Android 4.3 release 3.0

Change-Id: I17ea872d02f9e19192b57015f90bfcc109ce7e19