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

Change-Id: I3c3070b5183281ccd8a31408f18f6c7dd3c7ca21