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

Change-Id: I2753bc08180d1495c38520302df8a9b52cd281db