defconfig is now unified

Change-Id: Ic5e2e28a764c1c395d7aa476d49f7399abdc44f2