Merge "Remove useless g_common.h"