Merge "Move libmediahelper into a new folder."