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