Fix build files for tools and studio upgrade