Use New Defconfig

Change-Id: Ia873becb1e191f2b722fbb5e501cd7dc3a6960a6