MediaFile: fix merge derp

Change-Id: If9c7448e347f4424bf6182d91b87f00ab27e1955