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

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

Change-Id: Id8c1bf6095b96fb66f53435808092c4330d3097d