jf: clean up and consolidate defconfigs

* regenerate commonized defconfig
* clean up the mess

Change-Id: I6895d70d3256d0d0337373919ed9f29658f30e86