Fix lollipop builds