Merge "Revert "Make JVMTI DisposeEnvironment and GetEnv thread safe."" am: e6779fde am: 1ffc97e1 am: a1abf595 Change-Id: I0a132a2a1c38ee0a2a6d22be8d09322c304ab7cf