Merge tag 'android-4.4.2_r1' into HEAD

Android 4.4.2 Release 1

Change-Id: I8a6952485b16239d11750d635e170b923010c3dd