[PATCH OLK-5.10 v2 0/2] change arm64 and x86 configs