Merge "Handle virtio in private fs mapping" into rvc-dev am: 0d1fcb90d6

Change-Id: I11bc694a26676dd9f8b0fda7f2078a9bc6ed8719