Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r21" into oreo-cts-dev am: 41f560fc59 -s ours
am: 7d3b3b25ac -s ours
am skip reason: subject contains skip directive

Change-Id: Ic316d59c33ffe36360121602eebae4659ac78ccb