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

* commit 'f10c7fadad14e3fb3ac987984a71f8f4a34315b9':
  Fix CTS build