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

(cherry picked from commit f278152200fdc763bf4d2aa72b5dbbae13716afe)

Conflicts:
	default.xml