video: msm: Cleanup a bad merge

Change-Id: I02269a7a02880b3b8eadb47d441ef961d5a6cbde
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD