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

Change-Id: I1b8b0930f19d392d2625fe4b321b67755177cf4b