4.4.2_r1 -> 4.4.2_r2

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

Conflicts:
	default.xml

Change-Id: I98b7ca9fe0d21e6eaa0c852ba840623ebebf2f2a