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

Change-Id: I5ad3253e4abf7b1de6bd2a038017e9894ebba07a