am c8a7ea26: am 9cc068f7: am 7e32f6e8: am 4c38e93e: am 740064e9: am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev

* commit 'c8a7ea262a8cff7d555df7a02db3143c426a331f':