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

Change-Id: I655fe3d158b22d0483a6ad6d16402391fb5d7458