DNS: make the same ip type DNS query as the interface address type

Since dns query happens on non-default interface, only query the
 address type that the interface has;otherwise the dns results
 might not be usable.

CRs-fixed: 694805
Change-Id: I4ce900507bf18a9f60a2971cf496aa7c930d540b
Merge remote-tracking branch 'cyanogen/cm-11.0' into cm-11.0