Test: statsd_test Bug: 120635548 Change-Id: I0655f70098d78f8f6dc9381921c4a687d2195bd4 Merged-In: I0655f70098d78f8f6dc9381921c4a687d2195bd4 (cherry picked from commit 8c433861)