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

Change-Id: I08eb9815b8cac82650ea490826e7e92996ce12b3