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

* commit 'c4b48e7e39465eb0bb34d481e4dc46b5e8a4239c':
  Fix CTS build
tree: 96863bb59cca7c1307e283558304ebf05fe94a34
  1. tests/