Revert "Fix build error due to toolchain upgrade(gcc6->gcc9)"