The -Ox check in still useful to avoid the version of nasm distributed with Apple Xcode. This reverts commit 29b0c186. Change-Id: I9237791802267da708c3be8e5a83ca8d71e74afc
