Pull minor macro changes from downstream.
Make ant lib and include it in strategoxt.jar