[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r25" into nougat-cts-dev
am: cb56018a56  -s ours

Change-Id: Ib174477fedd8e68b3aa5c9864c97fb18ef798b5d