Cleanup ant related stuff

Bug: 51717
Change-Id: Idc1cdb16a6f10d20b37a8013f0ab7ea1ba7a3819