Moar 4.4 from aosp

Change-Id: I3fcdf81a73426ce2fcdfdbe8c48f12a7c3cbcf86