Merge with CAF-3.10, remove older 3.4 code. Add additional devfreq governors.