am 0b15e45e: Merge "Remove redundant complexity from JNI aborts."

* commit '0b15e45ecb6fe0731f4f313b0907cfb6d3536b80':
  Remove redundant complexity from JNI aborts.