Merge "Redesign dlopen() locks to be recursive per thread."