Merge "Revert "Revert "Make JVMTI DisposeEnvironment and GetEnv thread safe."""
am: b360bff818

Change-Id: Ie3c685eba7c114bbce72759781dc8d63feffefe8