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

Change-Id: If869420fee57167f0a1e6dbb40dae253478933b5