Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r16" into nougat-mr1-cts-dev am: bf6ca540b3  -s ours" into oreo-cts-dev am: 27db227b4d  -s ours" into oreo-mr1-cts-dev am: f842644a7a  -s ours
am: e00bc2db7d  -s ours

Change-Id: Ie64f506e3c12864a59fa2c86d9fa3286fd2af9f0