Merge "media: FileDump: Support cvp metadata logging"