Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r7" into oreo-cts-dev