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

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