Android: android-5.0.0_r6 -> android-5.0.0_r7

Change-Id: I0b874aa4047ce47cadd7059dba1aa97eccb20ca5