Merge "Remove ScopedUtfChars.h from global headers." am: 07c063daaa
am: a049b95b72

Change-Id: I8e31a4d86784d2250f38d4250c3a6af920282e24