defconfigs: Debranding

Change-Id: I37d4f4c2103b0656064f6658c7ccfb78a26aa0fd
dependencies: switch back to omni kernel

Change-Id: Id0d9a69ef4a46b757170943ce801a39333374f93