Reverted changes in ARM build process.