am 6206058a: (-s ours) am 329edcab: Merge "fix error typing of LOCAL_SANITIZE."

* commit '6206058a129794c1010b0f5435eb3d37343ccf0c':