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

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

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