Merge "Use --skip-config --soong-only instead of --skip-make"