Completed arm ACLE #ifdefs
attempt to fix up merging

Merge branch 'master' of https://github.com/SpiNNakerManchester/spinn_common

Conflicts:
	src/arm_acle_gcc.h