Merge "Revert "Export prebuilt tools to Make""