Merge "Enable libasan for x86_64" am: 754fd3d334
am: af2961bb13

Change-Id: I240b4317704d228ccbd22aec93cd4071c6afcfec