Merge "Refactor prebuilt tools"