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

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