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 am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b  -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821
am: 9ee582f644  -s ours

Change-Id: I01b135b3a87847b00451ab60a71013197e99f950