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

Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d