5.0.0_r7 -> 5.0.1_r1

Change-Id: Icbd514cd6ba12a86d369b1ae55599720da16afb1
Merge remote-tracking branch 'cm/cm-12.0' into default

Conflicts:
	default.xml

Change-Id: I18fa8194f3dcc8f100b93c0f64be76f9aacef21b