Merge "Fix build error using gcc 13" into tizen