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

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

Change-Id: Ia7bfda73d6f15494bddfeab4015cd59114d7f79a