[automerger skipped] minadbd: statically link libadbd. am: 22beef1b28 am: 9267225df0 am: 2526ae8aeb am: f41f9e2f41 -s ours am: 0a5750a0a2 -s ours

am skip reason: Change-Id I5233b1a23c14f9d478bb77c25ebdbb0ce45bcc5a with SHA-1 22beef1b28 is in history

Change-Id: I9fa209e916fea1a792a536db817d857f3a934a59