Merge tag 'android-4.3_r3' into HEAD