Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r11" into nougat-mr1-cts-dev
am: e988c964a6  -s ours

Change-Id: If5759b5d276e7d72f6defdb14c56e34a21aba40a