Merge "Make OSTREAM_STRING_POINTER_USAGE_WARNING build even with GCC"