am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev

* commit '7e32f6e8c071cea40b4cae9a11d591c052602abe':
tree: 162aa76ce1ac88a2a386b0b826c5b850a869c82e
  1. tests/