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