Revert "update media_build + addon cleanup"

This reverts commit 13b44e3f36f973a1245f2693f8fe1c2d348f5cb0.
Revert "Merge branch 'openelec-4.2' of https://github.com/CvH/OpenELEC.tv into openelec-4.2"

This reverts commit 1897555a170317a1c2e8e5f1aca504167676f9e3, reversing
changes made to 13b44e3f36f973a1245f2693f8fe1c2d348f5cb0.