changed FlowDroid to match the changes in the solver