Revert ""Squash Revert" msm: vidc commits from Cyanogenmod"

This reverts commit 57d1d60329fef7606681c417b066fc8f22661b79.