Merge "Update for public android_set_abort_message()." into lmp-dev