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

* commit '4e7386bda93c41b622c64b1ce17b7d1b8bd503fd':
  Fix CTS build