Merge "Revert "Revert "Move libmediahelper into a new folder."""