Merge "Fix CTS build" into lollipop-cts-dev
tree: 7d549be180f8fc8e854a2575dbf7b4e3c09b9da3
  1. tests/