Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" into lollipop-mr1-cts-dev am: 9bb9e26289  -s ours" into marshmallow-cts-dev
am: 49830a662e  -s ours

Change-Id: Ief9d070a89cbc89af975e600a65494adbd1cf934