Merge tag 'android-4.4.4_r2' into HEAD