Merge "Move a few internal constants out of resolv_params.h"