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

Change-Id: I0137dc608009daadf4b06fc861be81eb1fc11bb0