Revert ms-video to work with ics (bruce)
Change-Id: Ia1e749465ca07f882d25fa90a75c7b6063126f88
Signed-off-by: Matt Filetto <matt.filetto@gmail.com>