Merge "x86.h,x86_simd_caps: add an explicit cast w/strtol"