Merge "Update antlr to 3.5.2"