Merge up work for to remove build.cc