Merge "Fix link-type check warning on org.apache.http.legacy.boot"