More clean up for sharing virtual files.

Follow up for Steve.

Test: Unit tests.
Bug: 28409713
Change-Id: Ieeffbb276c5ccf62c366b08e3afe6c1e8bd4135e
2 files changed