am 0ffaa2b7: Merge "Fix __android_log_assert to abort."

* commit '0ffaa2b75acde02b0ea0e7985dd957c6bc3a2370':
  Fix __android_log_assert to abort.