[automerger skipped] Merge "org.apache.http.legacy is built with java_sdk_library" am: 897ecd2e80
am: a0ecbc9c04  -s ours

Change-Id: Ide540e6876f93d581ab40d6057c93523c450f16b