m7-common: Remove HCE

Change-Id: I81151a7073db5d4fdb799c4414ae0b1d39886ec8
m7-common: switch back to ondemand

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