Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 8.1_r21" into oreo-mr1-cts-dev am: 07ffc01892 -s ours" into pie-cts-dev