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

Change-Id: I0b6670eaa4dacd2483463ed0c50e992af98b66cb