Merge "libvideoeditor: fix M4OSA_Clock header guard"