Merge "Remove usage of mFileName in ObbInfo"