Merge "NativeHelper: Avoid returning local stack string"