Merge "Fix parsing SDK Tools in ant tasks."