Merge tag 'android-4.4.4_r1' into HEAD

Change-Id: I51b909f350fcef67fb98a674160266d6263e7bd9