Revert "Fix mako build to accomodate qcom media changes from CAF"

This reverts commit 04e5be0ff5a8b4b28180d232e87777eb7521567f

Change-Id: I3ca948b31d312be995459a78484e9ef0a3475c8a