AndroidTracker updated (stability fixes)