Ondemand: fix redefinition

Change-Id: I59cb1989ba8a45823f13b78139194440fe9a57e4
defconfig: remove erroring cpufreq governors.

Change-Id: Iffa68b09d2d297c479f7ae43c2d56483e72a669b