Use a "make savedefconfig" to clean up the phone and devkit defconfig files
This will create a new commit in order to revert the existing changes.
