Merge tag 'android-4.2.1_r1.2' into jb-4.2