Use new defconfigs

Change-Id: Ibfefdb2969b067789166d96de3dfb76ba631f646