Merge "Work around buggy toolchains."