Merge tag 'android-4.4.2_r2' into HEAD

Android 4.4.2 Release 2

Change-Id: Ifad43081362e478e8aaf8847cc512fcd942b64f0