m7-common: switch back to ondemand

Change-Id: I0465bd8a36214a0faeab1c1088d7bf791550be82
Merge remote-tracking branch 'cm/cm-11.0' into HEAD