Merge "Clatd changes for move of libipchecksum."