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

Change-Id: I6c7aeebfaa57bc45615c2c6dcabbcafdd34942bd