updated android libs, refactored collision detecting (again)