gpu: msm: Cleanup after merge

Change-Id: I099b713103f62d3787ad8f63940f3a3a13a5f1c1