Merge "Fix generate-NOTICE to cope better with BSD __COPYRIGHT macros."