Merge "Remove ScopedUtfChars.h from global headers." am: 07c063da am: a049b95b am: 233b4c98 am: f17bf110 am: 8a9e71d2 Change-Id: I0e140e9a7f6b272ea27402da0a74b75741cc5ba4