renamed kitkat to non-lollipop