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