Merge "Fix CPU architecture check for x86_64."