Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r25" into marshmallow-cts-dev am: 164b79d973  -s ours am: c626bb3109 am: 55eb9d3855 am: c2db9c6aa8 am: 004655ac43  -s ours am: 7877dd0678 am: f8f50a48aa am: 34e07843ea am: 72e126dc84 am: e40ea4f2cf  -s ours am: f018f51cdd am: 860f7e7432 am: eb44b70ef4  -s ours"
am: 741081822c  -s ours

Change-Id: I49189cbcf487ab67cd00a7b075103cbf2473dbd0