am 240475de: am da2fd5aa: Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."

* commit '240475dec7ebf205744e6496f845b7f61040eb18':
  If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.