Merge "Fix GCC build."