Merge "adbd: strip nulls from all service strings." am: 79f304771c am: a480af956c
am: 5d9509a36f

Change-Id: I0b3ac6e4069b306aea9352c9855ceb34ebc89b32