Merge "Try #3 for deflaking class loader tests."