Merge "Leave 'linux' defined on x86/x86-64, like arm."