Update defconfig for latest CM11 merge

Change-Id: Ie12430df9c1edcb89b3bc7c1929cffc5e06613d9