defconfig: branding

As well as make it proper so it gives good and working builds
Change-Id: I008962c164a408295d9a0df7090590010b1b9779
Merge "defconfig: branding" into android-msm-hammerhead-3.4-kk-r1