Manifest for Android 5.0.0 release 6
Merge tag 'android-5.0.0_r6' into HEAD

Android 5.0.0 release 6

Conflicts:
	default.xml

Change-Id: I3c5b1a8e259cd409d0c4aa39f8520fe770c27250