Merge "Antlr: Suppress MissingOverride" am: 7c41f2190a
am: f27dca5549

Change-Id: I8e4f5f8657c956de5b3f8f21fc332830f476466f