Merge "Fix fallout from host GCC upgrade."