Merge "Use --skip-config --soong-only instead of --skip-make" am: 44c45759f9 am: c9ca8f000b

Original change: https://android-review.googlesource.com/c/platform/development/+/1874616

Change-Id: I4aaa298d0745b4bd38039b0df8b0643c3cae6fb4