Merge "Use --skip-config --soong-only instead of --skip-make" am: 683072055b am: 88b9f66530

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1874956

Change-Id: I3f3df1723c7e6a9a690ab4d16cc97334c7d86199