am f0aa4cc0: am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

* commit 'f0aa4cc0f257448f76e9d90b97abf9682e930fbf':
  Fix improper use of JNI_ABORT for operations where Java objects are written.