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

* commit '4c38e93e2067c8a0219865c0d5a10f5a66809d8c':