Updated build system for arm and x86.

Build for arm currently does not work.