Re-applied AX to a clean CM base

Conflicts:
	core/Makefile
	envsetup.sh