Merge tag 'android-4.4.4_r1' into HEAD

Android 4.4.4 Release 1

(cherry picked from commit a5ff4ed78ffbe38174caa17553adc7dd9fbad034)