Update common-universal-cmake