am dc47e986: Merge "Fix generic JNI stubs to not discard the Java native frame."

* commit 'dc47e986941b1a3754447fabea272485f3f0f382':
  Fix generic JNI stubs to not discard the Java native frame.