Merge "adbd: compile for host." am: b42946a6d3 am: 134576deba
am: 4162be2090

Change-Id: I29e1f100ba8990ca4d003343c73fc97f59a8b61f