Merge "Fix gsi_{arch} builds due to NOTICE.xml.gz" into main