Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r12" into nougat-cts-dev am: 1f74e4ce01  -s ours am: 73ca853a63 am: 5122dd98f1  -s ours am: de4f7cfa2e
am: 85c34d3017

Change-Id: I56c0da214b3e3e2a4f2b0224dd01f91c75ac8a9b