Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."