Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13" into marshmallow-cts-dev am: a34d54c716  -s ours" into nougat-cts-dev am: 900e4f9928  -s ours" into nyc-dev
am: 617f5a06be

Change-Id: I62521d93a2a4262e8a4f78c0654ee406adfddf82