4.4.4_r1 -> 4.4.4_r2

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

Conflicts:
	default.xml