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

Change-Id: I1d997a51096a9aa5e186198c112584e31a39b363