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

Change-Id: I642436a6fcbd5bf16b6e64c22638e4f061244832