Revert "msm: mhl: still in merge"

This reverts commit b273ec5a9126d4e3b5715412cf92c8b1aa393015.