Merge "Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r23" into lollipop-mr1-cts-dev am: cd905ac74c  -s ours" into marshmallow-cts-dev am: 4008868588  -s ours" into nougat-cts-dev am: d70c7774ab  -s ours" into nougat-mr1-cts-dev
am: 0cad5fc682  -s ours

Change-Id: I038cd1bce2a6235b10b811f92890ffd60e197d81