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

Change-Id: I30e468c9b59a92cd883db53aea2d93fd17eeb0c2