Merge "Reset class loader after updating instrumentation paths"