Adjust for existing android support