Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r24" into marshmallow-cts-dev am: ab95db936d  -s ours am: f17f950110 am: 2b831503a4 am: 2b19f05d4a am: c897630741  -s ours am: 5b0ad2a196 am: 2d5e35b795 am: 8b552df327 am: 4d5dea0480
am: 741284d292  -s ours

Change-Id: If255084bd212a35fa807235711219510fa8d6bd3