Merge tag 'android-4.4_r1.1'