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
am: 51bd2878c1  -s ours

Change-Id: I995d17e8f18ac084eaa1f8ba9733b7083f6a5190