Merge tag 'android-4.3.1_r1' into HEAD

Android 4.3.1 Release 1
Merge remote-tracking branch 'upstream/cr-main-10.2' into cm-10.2