am 8e541b12: Merge "Moved nameser.h and namser_compat.h to public include dir"