Asan.options: Use abort_on_error am: 67b7e85b18
am: 4f31cff93b

Change-Id: I8c06aea3ede9f93493aa905ceb0c363e8abc3c1f