Merge "Replace some Arch uses with Abi."