Merge "Don't send ClassFileLoadHook before JVMTI_PHASE_START." am: b43836abb3
am: 372f071542

Change-Id: Ia18a9174e21e72df443514dd3debdfcaf437ab11