Fix android builds from CLI