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

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

Change-Id: Iec19d21913720d7cdad69342997951f3a16d2160