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

Change-Id: If9121b4b63a7b209084293cbe682fded3e3677dc