4.4.2_r1 -> 4.4.2_r2

Change-Id: I88d21c3cfd138dd8d5b23c23b5d294c138663850
Merge branch 'cm-11.0' of github.com:CyanogenMod/android into cm-11.0

Conflicts:
	default.xml

Change-Id: Ifc10727e44188dd870ef18bb5a8e0eb30f662936