Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

Change-Id: Ie8e43fb971183f172fa8f2112b0cc103be6614f6