am c3507d10: Merge "Frameworks/base: Replace LOG_FATAL_IF in core/jni"

* commit 'c3507d1098a444176a7270cba7e5299af7f77350':
  Frameworks/base: Replace LOG_FATAL_IF in core/jni