am 26e819f3: Merge "Revert "init.mako.rc: Enable ondemand multi-core performance optimizations"" into jb-mr2-dev

* commit '26e819f3a1bb4f019e8e9b8b960c7860794c1082':
  Revert "init.mako.rc: Enable ondemand multi-core performance optimizations"