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

Change-Id: Ib79ca9c4f2d1f3ec52352ec14c48041fa9d08ae5