mondrianwifi: Cleanup overlays

Change-Id: Ie7073c77996c803c73ae810e505b00829365cb62
Merge remote-tracking branch 'cm/cm-12.0' into HEAD