am 381a3651: Merge "Work around buggy toolchains."

* commit '381a3651b8635a8e8cac3d79e69c7a589128e094':
  Work around buggy toolchains.