am 1583dca5: am b5010ce1: am 4e7386bd: am f10c7fad: Merge "Fix CTS build" into lollipop-cts-dev automerge: f6b2775

* commit '1583dca5ec03dc85ee48f22863600743ceb6dd77':
  Fix CTS build