Merge "Antlr: Fix infinite recursion" am: fd960efa15 am: ae444d1ccc am: 7411dad8b8 Change-Id: I52a63bb16632bef0edc0890676464b8debf66b95