am 3e3fbc4d: Merge "Update for public android_set_abort_message()." into lmp-dev

* commit '3e3fbc4d734c1394823ac3d91b88c4aa87c6b265':
  Update for public android_set_abort_message().