Merge "Remove empty zip warning on host builds"