am 0f6615fe: Merge "Fix incorrect IsHeapAddress in jni entrypoints."

* commit '0f6615fe052a499ff7d6e6583a2f66aeb6146f1e':
  Fix incorrect IsHeapAddress in jni entrypoints.