Manifest for Android 5.0.0 release 7
Merge branch 'android-5.0.0_r7' of https://android.googlesource.com/platform/manifest into L

Change-Id: Idea0c71183626dbfaf34f10ab5c1197f6e3196c8