Merge "Antlr: Fix infinite recursion" am: fd960efa15
am: ae444d1ccc

Change-Id: Id9fa5e5fe25237bb4fcd6ee3d2e12761ee2a6498