Merge tag 'android-4.4_r1.2' into HEAD

Android 4.4 Release 1.2