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

* commit '4e7386bda93c41b622c64b1ce17b7d1b8bd503fd':
  Fix CTS build
tree: 3338dc342024194ff49fa639432596dedecf6aef
  1. tests/