Merge "Refactor JVMTI ClassFileLoadHook handling" am: c7e546ff39
am: ddd5f25d01

Change-Id: I83f15f2d416c4dd9d1deabf5d330e656edb71bec