defconfig: merge android L

Conflicts:
	arch/arm/configs/linear_defconfig