5.0.0_r7 -> 5.0.1_r1

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

Conflicts:
	default.xml

Change-Id: Ie6be2d1b9023f9b31feb1c48aa3a8be6cd00d61e