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