Merge "Add trivial no-op <nl_types.h>."