Merge "Updating antlr 3.5.2 to antlr 3.5.3"