Merge tag 'android-4.3_r2.1' into b2g-jellybean