Yes.
I suspect the CIA annex and its personnel are what they were trying to find and destroy from the outset, with the attack on the diplomatic compound intended to draw these "first responder" Americans to the scene like a typical jihadist two-part bombing... or at minimum get the CIA to come out of its cover so they could follow them back to the nest.
Hicks said the mortars were deadly accurate.
To me that says they had known just where the annex was for quite some time.