Merge "Refactor JVMTI ClassFileLoadHook handling"
am: c7e546ff39

Change-Id: I2a094f577d96fc591f5a6b5ea9e5192dcc0135fe