Merge tag 'android-4.4.4_r2' into HEAD

Android 4.4.4 Release 2

Change-Id: I018bde73c151668a5b1e22d14c7d55933f40d280