Merge "Fix ant issue where annotations.jar causes problems."