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

Change-Id: Id493a0ce807e77ff777c70320a80f15d5428cffb