Move BuildCommon.xml back to build-tool