Revert "Build with 4.9"

This reverts commit 9179fdef655bcf8c19597c2d0e42f3ab88387c54.
Merge branch 'jb-mr2' of https://github.com/OurROM/build into jb-mr2