Merge "Revert "Add ::1 to localhost in etc/hosts"" am: f6a35e2c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2300417



Change-Id: I4fc1a451423ddeb657872c92acd5194f3f19bc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>