Linaro back to 4.7

(cherry picked from commit e1ca6c5983ff56e3eaa5440b593bc49944244bb9)

Conflicts:
	core/combo/TARGET_linux-arm.mk