Revert "Merge branch 'jb-mr1' of https://github.com/TeamHorizon/vendor_xenonhd into jb-mr1"

This reverts commit 8d81af921afdddcd85f7c256627b8a6a3f509d77, reversing
changes made to ed634559e73b61032e9c5d56e85efe2c1fd7c1ad.