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

* commit '8c9cbb214c161eac0c723f4f887965006bd9f108':
  Update for public android_set_abort_message().