Merge tag 'android-4.4.2_r1' of https://android.googlesource.com/platform/build into kk4.4

Android 4.4.2 Release 1