Adapt to google::protobuf::int64 type change and scoped_ptr removal
am: 43b95eae1e

Change-Id: I7771ad00341e37660c4803bcb33ab4afa2331404