Merge "Revert "Export prebuilt tools to Make"" am: 9fe574e1bf am: 615a36a43d am: cf4ff09c0e

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

Change-Id: Ib6614596d8347a3dc5104fe535de8e8fbf3f1fab