Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

Change-Id: Ibf481623c67f8e0edec35362d48bcc275e4f4def