query/expression_index.cpp includes index/s2_keys.h

query/index_bounds_builder.cpp includes query/expression_index.h

However, index/s2_keys.cpp currently includes query/index_bounds_builder.h, which should not be the case.

The query specific code of s2_keys.cpp should be moved outside of the index directory.