am 02ddfd0e: am dbbe8cf0: am 0fce02ed: am a0b6ce93: am 57d56240: am f6b2775e: Merge "Fix CTS build" into lollipop-cts-dev

* commit '02ddfd0e41644c4aaf55b1298f7fe893b6b210c2':