Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

Change-Id: Ibb5faf522a9c25733b263e97787d0fdc81de6cbe