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

* commit '1d9f784f35a330f0b43dcd31574000d5ae5b5bd7':
  Fix __android_log_assert to abort.