Merge "Stubs lib for org.apache.http.legacy is changed to -.stubs."