Merge pull request #4673 from acozzette/memory-leak-fix

Make sure to delete temporary maps used by FileDescriptorTables