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

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

Change-Id: I6c89e8a9cc64e87b747e70049ae3f3c7fc6d851c