[automerger skipped] Merge "Stubs lib for org.apache.http.legacy is changed to -.stubs." am: 826e268c am: 847e9168 -s ours Change-Id: I1603640af0e8072c27197cb05f0de8af6a80a670