Merge "Update antlr to 3.5.2"
am: 023edee1e8

Change-Id: Iaf9b6adcf410654d79b252fed1f525f3adfe7ffa