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

(cherry picked from commit 3758a244cf758046b40f630a11aed41e68c9cfc2)

Change-Id: I6ffb83b4a7b7746b095205c664cf025a72ead179
4 files changed