Merge "Fix GCC build breakage."