AndroidTracker updated (several improvements)