Merge "C-ify MediaTrack"