We need the extra combo for the plain Android AOSP.