Merge "Nextgen release: Don't build images that GSI don't need"