4.4.1_r1 -> 4.4.2_r1

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

Conflicts:
	default.xml