Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2
am: 65200cf70e

Change-Id: I952a9cbcb9bf9d2d479efecc28c5411e31dc9cf6