am 5afe0aab: Merge "Update tsan build."

* commit '5afe0aabc29b9bb34f0fe2bfb7ef7bb0af6325a2':
  Update tsan build.