defconfig is now unified

Change-Id: Ic8c08fb1257579ba15ab7d48d10b92dab69d870a