Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1R12" into lollipop-mr1-cts-dev am: d6bfc3ab0a  -s ours" into marshmallow-cts-dev am: 9e75252312  -s ours am: bcde5285c7  -s ours am: 49cfd19a39 am: 18d63d0e05
am: 648f180303

Change-Id: I2c191cae21de652c915e9bcd4e5c80776b1f3e77