Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library"
am: 9f89b3393d

Change-Id: Id9dbe2ad5fc0e4a7ed4ef9a65bb9a41831b70564