Revert "defconfigs: Debranding"

This reverts commit 40913b29af0ecba2b883c54d0afbb8e5a63aa570.

Change-Id: Ib0a70dff9c32ed92cc3a930b1ae7e78a1986df48