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

Change-Id: I148f09f9953b9f2a1f2b0b93730f7e52280951de