Merge "Update antlr to 3.5.2" am: 023edee1e8 am: d522258e22
am: a72b3c8bb8

Change-Id: I61399d0c1f3f6891613344369eb79f9d7c8fb68b