Merge "Add initial implementation of MediaParser"