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

Change-Id: Ic35d962ae98bc4d86a7242bfe7665d338a55a337