Merge "Handle virtio in private fs mapping" am: e471d11d46

Change-Id: If088b875ff4cbca66fe9c6f9224b437edc85dae8