CONFIG update

Conflicts:
	arch/arm/configs/ap33_android_defconfig