am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev

* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
tree: 7ed1e5c4cbce62e5bca4103e4b76c8fbac5d2e67
  1. tests/