Merge changes from topic "am-4601e3b1584e408da71c5f4ed61d7df2"

* changes:
  Merge changes from topic "revert-protobuf3.5.2" am: a4680e1ebe am: 3e312d20cd am: e217b6222c
  Revert "Convert statsd_test and statsd_benchmark to proto lite" am: 47046b80d2 am: 65200cf70e am: bd7c4efbb6