merge mm-video from media branch.(testing, will most likely break compile)

Change-Id: I12a2a30e276fd6f8f4a95bced0feed30d967bbe4