[automerger skipped] minadbd: statically link libadbd. am: 22beef1b -s ours...
[automerger skipped] minadbd: statically link libadbd. am: 22beef1b -s ours am: 1d3cfc28 -s ours
am skip reason: Change-Id I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a with SHA-1 22beef1b is in history
Change-Id: I10207d6d9122fd04fef559e65e9796663ba6db9f