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

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

Change-Id: Ib6a64584e4ebbf917bda3a133311df84d4e8584e