CB-7368 --archs="x86" now produces correct binaries.

Fix for https://issues.apache.org/jira/browse/CB-7368