Makefile: Added ARM optimizations

Conflicts:

	Makefile