Merge "adbd: make static."
am: b41b33581e

Change-Id: Ibff3e3e19d7805fe4d70996ad1ba35372a3bd7b1