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

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

Change-Id: Id73de89d4b905212935da4286ee50789b47695e6