Merge "Fix link-type check warning on org.apache.http.legacy.boot"
am: 2b82eb996e

Change-Id: Iabc34b6c124a8f3de8476b14963387aafd2bde0e