Merge tag 'android-4.4.3_r1.1' into HEAD