am 221e49a1: Merge "NativeHelper: Avoid returning local stack string"

* commit '221e49a1ca260781ecdabdfa106d2e47d444e6de':
  NativeHelper: Avoid returning local stack string