android-5.0.0_r6 -> android-5.0.0_r7

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

Conflicts:
	default.xml
Merge branch 'CyanogenMod-cm-12.0' into cm-12.0