Makefile: solve conflict with previous commit "ARM: Use -mcpu=cortex-a15 when targeting MSM Krait CPUs"

Conflicts:
	Makefile