Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r16" into lollipop-mr1-cts-dev
am: d373ad8ae4  -s ours

Change-Id: I97f670ca97403ab24f25272dedf375ade857d2bd