Merge "Merge "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 am: 0e4b4803e9  -s ours" into nougat-mr1-cts-dev am: 5f802b2f84  -s ours" into oreo-cts-dev