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

Android 4.3 release 3.0

Change-Id: If83392c99908bf381d11dbecb006473ced9bb83f