revert Build with SaberMod 4.9  (for now)

Change-Id: Ida095fda6eb1cff998aac1de91fc155d021bf876 (reverted from commit 3899a6ffb18f939386eec5fb56ebfb8ac9da556d)