am 5c16eb07: am afc9bc01: Merge "Update for public android_set_abort_message()."

* commit '5c16eb07721252a8a5d8ad436319e94d7c974e44':
  Update for public android_set_abort_message().