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

* commit '405a934ec46fccf7d2e6e573bb65a5be4b51665a':
  Fix incorrect JNI_ABORT