Revert hammerhead: switch back to ondemand till slim govenour is back

want to tweak it before we use it on lp again.

Change-Id: I8960ec7a7e25aea5954669df19719d65b031ab2b (reverted from commit 2e67ed592439d720881a64f7cf7699513f8702bb)
Back to SaberMod 4.9

Change-Id: Ib99658bd01c488bedc4564b4ce4876641db2a14e