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

Android 4.3 release 2.1