Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master