Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r19" into lollipop-mr1-cts-dev am: 10cba952b4  -s ours" into marshmallow-cts-dev
am: 6a77385e56  -s ours

Change-Id: I1618e3d5d68dfd8eb2a035e12af3b7239506faef