Merge "test: Add 961-default-iface-resolution-gen to known failures for ASAN" am: a11100ee3a
am: 0e380bcaf9

Change-Id: I77f60d2cbbc998aebf97f97e114392d199ca7747