Merge branch 'cm-12.0' of https://github.com/CyanogenMod/android into cm-12.0

Conflicts:
	default.xml