Remove OSX cross stuff from main Dockerfile Upstream-commit: 9823457ed5af653689a3eb59f43960138b5528f3 Component: engine