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