Merge "codegen: do not assume arch is arm64"