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

* commit '4f0cb0307b93b407abe110f3d17085d7807c137c':
  Fix TARGET_ASAN build.