am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '1638a0049b4a5edae6aaf73a55a6aa7e14f71075':
  Fix incorrect JNI_ABORT