Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r22" into lollipop-mr1-cts-dev am: 5d081d28cf  -s ours" into marshmallow-cts-dev
am: 32a08d8c90  -s ours

Change-Id: I7aaafe3b969ae31cb559c6dba032cc025c6f7347