Merge "Merge history of cts/hostsidetests/statsd" into stage-aosp-master