Merge "Adapt to google::protobuf::uint64 type change"
am: b8fd364d0a

Change-Id: I90023dd0001e2bb0be1207dfe98d65c3a81184b3