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

Change-Id: I9ef2acf09fe51567184ec9aee508c98170424d96