Merge changes from topic "revert-protobuf3.5.2"

* changes:
  Revert "Adapt to google::protobuf::uint64 type change"
  Revert "Convert statsd_test and statsd_benchmark to proto lite"