Merge "Asan.options: Use abort_on_error" into nyc-mr1-dev am: 0c28557e58
am: 993d56dff9

Change-Id: Ibdc979ef60379d5fb86f673b59c7cbb26f37d81d