Clean-up CL for CL985267.

CL985267 was merged with one comment left unresolved. This CL resolves
that comment.

Test: Built with a pre-built vendor image and ensured additional
licenses were placed in NOTICE.xml
Test: Built with a vendor image and ensured additional licenses were
placed into NOTICE_VENDOR.xml

Change-Id: I927f09b4b501c38447702ee2fd8fdbdd5934ad20