Merge "Remove duplicate classes from org.apache.http.legacy.stubs" am: 1e147ad9d0 am: 746d3440c8
am: fe8af22495

Change-Id: I26d6ba224a99fb96349ad5fe058f42be1901ddfa