remove extra defconfigs

also add intellidemand as an option
Change-Id: I6e1cb26926cbba44f59ff2db1d8e3be90faf72c3