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

Change-Id: I43130dba4096622937b5d7ddc582713454c9e057