holiday: update defconfig

During the ION bringup some things got merged in that weren't needed

Change-Id: Ia6a22cd2459761478e00b0b2d98774d70891522d

Conflicts:
	arch/arm/configs/holiday_defconfig