Merge "Revert "Adapt to google::protobuf::uint64 type change""
am: 4d16ee4f10

Change-Id: Ida7f1eec76819f0703bf2e05cb081a39bbe2ff78