Merge "Selectively add _asan flavor suffix."
am: e5143608df

Change-Id: I1db40b92af1e23ea84bc2ec0876e6521c79f8836