Upgrade to 2.10 cross build

Also added protobuf and thrift back into the build. We'll see how this works.