Defconfig: updates

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	arch/x86/configs/custom_defconfig