Manifest for Android 5.0.0 release 7
Merge tag 'android-5.0.0_r7' into lollipopalooza

Android 5.0.0 release 7

Conflicts:
	default.xml