Merge tag 'android-4.3_r1.1' into HEAD

Android 4.3 release 1.1

(cherry picked from commit b96d6d08e779c74f6440f9400fad351a5dfc8e73)