Merge "Remove duplicate classes from org.apache.http.legacy.stubs"