Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r7" into oreo-cts-dev
am: 48bef7f6bf  -s ours

Change-Id: I439a8586491a2575e36195e333f9488a74696394