Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

(cherry picked from commit 6060f750524117f2dc71fc151c08500e60ecf0ad)