Merge "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" into nougat-mr1-cts-dev am: 874af4fd55  -s ours am: 8e2ca3c93a
am: 8fe94b3b81

Change-Id: Id78546e7de237b57446b58d350ae703c413f870c