Merge "org.apache.http.legacy is built with java_sdk_library"
am: 897ecd2e80

Change-Id: If799ed4ab2864cd4ea79754a3f06b854625bebca