Merge "Remove separate IPv4-only nsaddr_list from res_state"
am: 0a423e4b35

Change-Id: I7c8f04e20310350f05dde74974207a2481f8ab90