Fix the amalgamation builder so that it works with the rtree updates of
the prior check-in.

FossilOrigin-Name: 265b0b29b83fde813c63f401b979e619f2b12d5d
3 files changed