More clean up for sharing virtual files.

Follow up for Steve.

Test: Unit tests.
Bug: 28409713
Change-Id: Ieeffbb276c5ccf62c366b08e3afe6c1e8bd4135e
(cherry picked from commit 9693b4a42251b4824114a6386c1e24b24933fea2)
2 files changed