refactored Ant build file

Change-Id: Ie5f3f33d72a2f3197efe64bb3032de2321136984