Merge "Fix TARGET_ASAN build." am: 9bbc67b55a am: 4f0cb0307b
am: 8d5ff73ce4

* commit '8d5ff73ce4a3a48a414f25289ba5220f3e91f0cd':
  Fix TARGET_ASAN build.