Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa  -s ours" into marshmallow-cts-dev am: 2fe51274db  -s ours" into nougat-cts-dev am: a6d0d0df20  -s ours" into nougat-mr1-cts-dev am: 97980d26f2  -s ours
am: e8eba8a30e

Change-Id: I2b0390009cf26652f62802e776cc9e72f1fb7a4a