Additional memset fix for gcc 4.8

Conflicts:
	arch/arm/lib/memset.S

Change-Id: Iaa1ccdf6cc9814a8eb6a9fda0e142599420fd7e2