Remove unused ant files
Update manifest
Build with 4.3
Merge master