Merge "Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable."