mondrianwifi: Move to a unified mondrian defconfig

Change-Id: Id39f893904d3742841ce923f42f6e9220acea2ea
Merge branch 'cm' into HEAD