Merge "Bionic malloc debug: add a new option "abort_on_error""
am: 0a692a6d8d

Change-Id: I03f9eef49515494f4240ebee9202eaf968c393cb