Merge "Allow passing filenames to generate-NOTICE.py." am: 65cebf0804
am: 18f0ad8b86

Change-Id: I254d4fbb8fb2efffec04288c3b313e3a7285988b