Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

(cherry picked from commit cc4ba967529fbabb29b74b20c79e736ded1550c2)