Merge "Make ClassLoaderContextTest pass when OUT_DIR is used"