linaro 4.8 fixes

Conflicts:
	arch/arm/lib/memset.S