Merge "Remove ASAN specialization"
am: 0723ad3969

Change-Id: I05bca0d1e4c1709565a05f1997a883c173279a53