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

Change-Id: I8967341c18c7702ed405c464f901589461bd5f77