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

Change-Id: I69ebedf5b300e2c7e02b5a0949eb720a90777752