Merge changes from topics "prebuilt_build_tool", "prebuilt_build_tool_make"...

Merge changes from topics "prebuilt_build_tool", "prebuilt_build_tool_make" am: 582c71a4 am: 71f1afef am: 7ede6de4

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

Change-Id: Ibca204ce8cdccf718e99cbcddcf8fa45be36f1b0