Manifest for Android 5.0.0 release 6
Merge Android 5.0.0_r6