Merge "Fix lock order for jvmti kTaggingLockLevel"