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

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

Change-Id: I035dba2a99a0944e23a07c295cb1b8f9fbbe5992