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

* commit '740064e97f0e653427a7eb5f99052d9e5a8e27f3':
  Fix CTS build