Merge "Merge "inode2filename: Remove InodeSet copying causing ~O(N^2) inode copies" into rvc-dev am: ed348aee84 am: 8e9d142818" into rvc-d1-dev-plus-aosp am: 139eb99365 am: 97d1697340

Change-Id: I2bfb4ebe43cb76e4c7a40d3ee70978bd3e4715e8