Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp