Fixes for new Android build tools
Some cleanup
Ant build files
Moved tag 1.7 to changeset 0796416ca636 (from changeset 1c331f9f2291)