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