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

Change-Id: Idce31662195bf1a087a949fc4c4483b98d5d62c7