4.4.2_r1 -> 4.4.2_r2

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

Conflicts:
	default.xml

Change-Id: Ice20d761bafe4f798302b4d46950dc799f0d9809