[automerger skipped] Merge "Handle virtio in private fs mapping" am: e471d11d46 am: d625abfda2 -s ours am: 16cbb5a2c8 -s ours

am skip reason: Change-Id I0b41670d5f76b2506dad437917c2276f8e0aaccf with SHA-1 c671731075 is in history

Change-Id: Iece0b98e72676046f3d16dd9fa2cb22235a3cc25