Revert "Move libmediahelper into a new folder."

This reverts commit c8888660b53647ef1a9608493ab1a5dc93ba9b0d.

Reason for revert: Broke elfin build

Change-Id: Idfd67b064b28abf32da332149bdce212249345d8
10 files changed