Merge tag 'android-4.3_r2.2' into HEAD

Android 4.3 release 2.2