Updates to fix android multiple license file issue
removes deletes
Merge branch 'spaceshipwarrior2'