Merge "Move files in antlr to match upstream directory structure" am: bbed35ef4b
am: 32d1488b05

Change-Id: I48c299878b3a8f74e98454268cb1d9da0d19ac74