droid: updated xml files
droid: removed obsolete files