defconfig: clean-up

Change-Id: I8ccb33994d07096efcb8af133c91a362a2ea3d80
Signed-off-by: zwliew <zhaoweiliew@gmail.com>
defconfig: fiddling with branding

Change-Id: If86d9faa952d445b7954edd884bdd23f0219e53e
Signed-off-by: zwliew <zhaoweiliew@gmail.com>