Merge tag 'android-4.4.2_r2' into HEAD

Android 4.4.2 Release 2

Change-Id: Ic00d1d182028a00ade3291d2b397fb9580af0ff2