Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into lollipop-mr1-cts-dev