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