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

Change-Id: Icdfa4eb61d65cae78bd518d9965b6f4db194da02