Merge "[automerger skipped] Set dist_group: "android" for external/apache-http java_sdk_libraries am: 199612e35c -s ours am: 8ffaef845c -s ours am: 2d8e5e0ab8 -s ours" into main-plus-java-next-dev