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

Change-Id: I18ab02029443e2a1e51befdc69f103d73fc0a178