4.4.1_r1 -> 4.4.2_r1

Change-Id: Ibb2c771339e19d53963eff10de9bc530cde2a271
Merge remote-tracking branch 'cm/cm-11.0' into wszf

Conflicts:
	default.xml

Change-Id: Id4cb663e805180ef390e624f384ff66a0d991dd2