Fix conflict from remove of ssnprintf2 and align utils/common/common.h