Merge "Fix CTS build" into lollipop-cts-dev