Merge "Change envs_lock_ to a ReaderWriterMutex"
am: 03ff766dc8

Change-Id: Icaff87aba2ae71855ebd78e264b9b919d545402a