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

Change-Id: I3e0dc8f3366a7f948a887dc8927d3d3556350b78