am 2e7ccf9a: Merge "Enable ASan annotations in ART based on macro setting."

* commit '2e7ccf9aeb7212c96e2081b66f85b67856b8825a':
  Enable ASan annotations in ART based on macro setting.