Merge "inode2filename: Fix a use-after-free bug." into rvc-dev am: 9ba82bf571 am: 31b2f30ccf

Change-Id: I89869d51dde6853a537f8889a6c84709be7527ad