Merge tag 'android-4.4.1_r1'