Merge "media: Change setNextOutputFile to address API review comments." into oc-dev