Merge "Fix arm64 and arm builds."