[automerger skipped] Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library" am: 9f89b3393d
am: 4a67610175  -s ours

Change-Id: I63f9c340e6bafa4c6ace40c19e966c288b50ca9f