Merge tag 'android-4.4.1_r1' into HEAD

Android 4.4.1 Release 1

(cherry picked from commit 38e6896416d822338c702d487187706e88a4c6b9)