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

* commit 'afc9bc01b4f8a239b5f1a1c695b941a7d0ab8825':
  Update for public android_set_abort_message().