[automerger skipped] minadbd: statically link libadbd. am: 22beef1b28 am: 9267225df0 -s ours am: 0d6340f386 -s ours am: f7869e21e1 -s ours

am skip reason: Change-Id I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a with SHA-1 5ee3eba34f is in history

Change-Id: I195fc9916fa543351adcad7637c68fac64356738