Merge "Change envs_lock_ to a ReaderWriterMutex"