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

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

Change-Id: I31da5bc83ddc25dd416bad909841f4dfdb1140de