4.4.3_r1.1 -> 4.4.4_r1

Change-Id: I08ab842d171e11974f35ab83e458b15c37dd02bd
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	default.xml