Merge "Update prebuilt build tools path"