Merge "Adapt to google::protobuf::uint64 type change"
am: 05a08644bf

Change-Id: Ia9d43a0a1a1506cbc46dfd3a85148b0f2ef9f43b