Re-add defconfigs

Should fix honami build error
Change-Id: Ia840477372ab6dc5bce60573868c20af11a899e7
Merge "Re-add defconfigs" into kitkat