am 830467e2: am 5ade30e8: am 405a934e: am 1638a004: Merge "Fix incorrect JNI_ABORT" into lmp-dev

* commit '830467e2873767ff11960c3b9fecb2e7d4c57b21':
  Fix incorrect JNI_ABORT