Merge tag 'android-4.4.4_r2' into HEAD

Android 4.4.4 Release 2

Change-Id: I78c1fd80f2da3b8563c6f4bf59c88f9b7be80c47