Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

(cherry picked from commit d2d90230f80ed211f090f8bb333a15cbecb4c575)