Merge "Support preload of org.apache.http.legacy.jar" into main