Update CMake subtree and use common_library