Merge tag 'android-4.3.1_r1'

Android 4.3.1 Release 1