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

Change-Id: I5c013704f2e5386632ad5575682f314c81c79dee