Merge "Antlr: Fix infinite recursion"
am: fd960efa15

Change-Id: Ia4cc787d21e292c15337fa5b9fff8434fe9dad33