Update Makefile to be ready for AArch64
Update Makefile to be ready for AArch64