Updating to Lollipops, some lint cleanup