x64-upstream: Support arm and arm64 as target arch