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 am: 8b0d701366 am: 6c367e336f
am: dbda33f185

Change-Id: I0f07185ecb5735e37bef3f3135ac67f3110be258