Merge "Fix GCC build"