[automerger skipped] Merge "Retire device/generic/mini-emulator-x86" am: 88ffb97113 am: 540a2a226b -s ours

am skip reason: Change-Id I54f7b876633a29224943405482c8221216d08438 with SHA-1 f4db79332c is in history

Change-Id: I7381931ee126ca2da4ec01793eb193887c202afa
tree: 91d404617acb138681c16a1c4a87d2741a801719
  1. METADATA