Merge history of cts/hostsidetests/statsd BUG: 167962588 Test: TH Merged-In: If9619cb6ab2ae9c83cbfd0fcc1a6a19b9967c136 Change-Id: I587aefd8ab26a052b428e0aceeb4195776f2535e Exempt-From-Owner-Approval: Code cleanup