track aosp 4.4.4r2

Change-Id: Ic1c8c097c6f0a891804518e9d3f5890573e8a1e6

Conflicts:
	default.xml