Merge "Add ip6-localhost to /system/etc/hosts."