Revert "revert all the msm vid stuff from cm for now until they fix video playback"

This reverts commit f4e87debf787ed81ebc143d5b3471ffc8a4224cb.