Merge "ScopedUtfChars: use proper nativehelper headers"