Ant & Guava Updates

Applying old updates to repository that were done locally long time ago.