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

Change-Id: I1dc8ea5f8a91e80f96e3bc911fb5a2804dcc8fc5