am 1d2567eb: Merge "Fix SANITIZE_TARGET build of liblog."

* commit '1d2567eb7ca3ef449a6272fa45533b56d337fe6b':
  Fix SANITIZE_TARGET build of liblog.