One commit to Build them all

Conflicts:
	arch/arm/configs/cyanogenmod_acclaim_defconfig

Change-Id: I95864a49a84557f8278ce6ce2064b0b31140bffa