Merge "Revert "Revert "Make JVMTI DisposeEnvironment and GetEnv thread safe.""" am: b360bff8 am: fdf389d9 am: b99795e0 Change-Id: I0825f75326a72dc08e249ff2bdb1d18d8c69e9ee