Merge "Replace --skip-make with --soong-only --skip-config"