Merge "Fix CTS build" into lollipop-cts-dev
automerge: ab0f0fe

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