Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r28" into lollipop-mr1-cts-dev am: 6ebd08b079  -s ours" into marshmallow-cts-dev
am: ac28ed58d3  -s ours

Change-Id: If1d886a2f5b10fb3950d3cbf05539e1a7c66082b