Merge "Remove ScopedPthreadMutexLock.h"