Merge "Fix lock order for jvmti kTaggingLockLevel"
am: 4ba18fdfc2

Change-Id: I3a2b44a3f0fe5c21cd9c8d538c3e570a7ee67a3b