Merge "Remove ASAN specialization" am: 0723ad3969
am: 01d6334398

Change-Id: I17ad31f5cc0fcca510c56bbabd63c32cbc448698