Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r5" into oreo-cts-dev am: 195d1e603f  -s ours"
am: 1769d38d18  -s ours

Change-Id: I362e8c1a6143695fb63c2a7cc1fec5ce942b3785