Merge "Replace --skip-make with --soong-only --skip-config" am: 8d48ac9b21 am: 36d42b819b am: cdd0bfd42f am: 921b024ef3

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

Change-Id: I0657e59b7a56bcc0265815aa5275918ef895bcb8