[automerger skipped] Merge "Add org.apache.http.legacy.jar stubs to current/system" am: bc0fda3893 am: 35d65cd153  -s ours
am: bfb79b9fb6  -s ours

Change-Id: I7f89aff36146258c8901aadd2bd46c3d96b90414