am 0609c0fe: am 7af7895e: Merge "Use the new non-allocating logging for dlmalloc failures."

* commit '0609c0fe8dae2ec10f1811c46a4d583f557c68f7':
  Use the new non-allocating logging for dlmalloc failures.