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