am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe

* commit '92ec8f7720cb5232e1e07f21d9e53e17b298dfa2':
  Fix CTS build
tree: 409d97aed7b951cb7b5280715cdbd293289044a3
  1. tests/