Merge "Fix incorrect JNI_ABORT" into lmp-dev