Professor drops tenure lawsuit against UC Berkeley