Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r25" into marshmallow-cts-dev am: 164b79d973  -s ours" into nougat-cts-dev