Merge "Fix fragile assumptions about build toolchain. (attempt #2)"