Merge "Shared lib def for org.apache.http.legacy comes from java_sdk_library" into pi-dev-plus-aosp