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

Android 4.3 Release 3.1