Merge "ScopedUtfChars: use proper nativehelper headers"
am: 75c9e4d594

Change-Id: I170b5846981683eacee1081587c7149bab454d91