am 2081fda6: Merge "Only look up A records if the system has IPv4." into gingerbread

* commit '2081fda69a68505c914324797400b1b798516904':
  Only look up A records if the system has IPv4.