Merge "Fix ReferencesHidden issues in apache http" am: 55b5ba17af am: bd2a970763 am: 57aa3fda81

Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1348243

Change-Id: I14d4b7642abd8b3f678179f74ac626ff0199f0a2