Merge "Extend x32 check by also checking for __x86_64__."