defconfig is now unified

Change-Id: I64cab5a1d11d2805962eadb90249e112348655fd