Merge "Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files."