Merge "DO NOT MERGE: fixed build breakage" into lollipop-mr1-cts-dev