holiday_defconfig: merge a few more settings from shooter for testing

Change-Id: I9aa5ead71070e3cfe5301839705866a98f9bf2ba

Conflicts:
	arch/arm/configs/holiday_defconfig