video: msm: fix and cleanup some more ifdefs.

Change-Id: Ie7ebf9811fcc9cba7c6c0051510b51e878bedb2f