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