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

Change-Id: I5c285cd4cc39c93bcf71bc62ccbaafa618a61440