Merge "Make OSTREAM_STRING_POINTER_USAGE_WARNING build even with GCC"
am: 7becf26301

Change-Id: I734de51bbb9cbbb16f8768411711c67efd2c819d