Upgrage verion of common-base and fix issue build failure