[automerger skipped] Retire device/generic/qemu am: d95a67ed72 am: 3e8225d3b0 -s ours

am skip reason: Change-Id Iab852783c2728f5757a4a1e051119fd50f389df6 with SHA-1 12b48753e5 is in history

Change-Id: Ib4c43f7ccf5fb2e1258dc6679fcdc639d227183d