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 am: 8532404a5b am: ebd37434f7" into nyc-mr1-dev
am: 9af3c64f18

Change-Id: Id356ffa8576ee45058df3f00daa58bf77720b63f