Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp am: 1e8d712b78
am: 350b0ed191

Change-Id: I79194ce726ed314cc7d6c87d4a3ea4b0e12a7542