Merge "adbd: remove static dependency on libcutils." am: 7634dcd139 am: 7124657eda

Change-Id: I2f08d3c97b782d7ab8761cd1cb7d6084dd3f736b