Merge "ScopedUtfChars: use proper nativehelper headers" am: 75c9e4d594 am: e04a0bf5c7
am: 99cb134bf2  -s ours

Change-Id: I17668ddde69926f6648d75f2b74f54f234fc5c02