Merge "Merge "Merge "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 am: a8b3fdfef9  -s ours" into nougat-mr1-cts-dev am: e90c42e63a  -s ours" into oreo-cts-dev am: 3c0cdbc0ac  -s ours am: 3b3315e00c am: f360d28744 am: fc86ef9e80  -s ours" am: df4731c84e  -s ours am: 3e96d56991
am: 905a8d92f9  -s ours

Change-Id: I8194e4ec19fe995ec7f5537826705413cb6b30f4