Merge "Statically link libadbd into minadbd." am: db22f23dd3 am: b903481992

Change-Id: I44d9fa2effda1f09c80bc3855ba7e3fd4c1bb6cc