mk: Fix non-android cross builds.

Fix some fall out from the big command line option changes.