Merge "media: fix build break"