Remove some more unnecessary deps from //src/com/facebook/buck/query.
Remove some more unnecessary deps from //src/com/facebook/buck/query.

Summary:
Again, reducing the deps of `com.facebook.buck.query` will make
`MultitenantQueryEnvironment` easier to implement.

Reviewed By: bobyangyf

fbshipit-source-id: fbd35e3472

nguyentruongtho/buck,Addepar/buck,JoelMarcey/buck,Addepar/buck,nguyentruongtho/buck,JoelMarcey/buck,Addepar/buck,nguyentruongtho/buck,nguyentruongtho/buck,Addepar/buck,kageiit/buck,JoelMarcey/buck,Addepar/buck,zpao/buck,kageiit/buck,JoelMarcey/buck,zpao/buck,facebook/buck,JoelMarcey/buck,zpao/buck,facebook/buck,Addepar/buck,kageiit/buck,zpao/buck,Addepar/buck,JoelMarcey/buck,facebook/buck,facebook/buck,Addepar/buck,JoelMarcey/buck,kageiit/buck,JoelMarcey/buck,nguyentruongtho/buck,facebook/buck,JoelMarcey/buck,Addepar/buck,zpao/buck,Addepar/buck,JoelMarcey/buck,facebook/buck,kageiit/buck,nguyentruongtho/buck,nguyentruongtho/buck,zpao/buck,kageiit/buck,Addepar/buck,JoelMarcey/buck,Addepar/buck,JoelMarcey/buck,kageiit/buck,JoelMarcey/buck,facebook/buck,zpao/buck,Addepar/buck