Revert "Split HttpEndPoint interface"

We don't want this commit in the release, it will reenabled
once the release is done

This reverts commit 64272ff19aca370f985892dcc20bc43b35f3dc38.

Change-Id: I1418ea044a490aaafbf4199e0ffd27d4cffb3376