Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80  -s ours" into nougat-cts-dev am: 021fddf3fe  -s ours
am: 81620c6d52  -s ours

Change-Id: I110f5895a46d64c94304fd8e4b1d0e6f6da2b8e0