Revert "defconfig: From CM d2: commonize everything commit"

This reverts commit 98a9e43024e409d8f9f654203bf012a007d4d33a.