Merge "Revert "Include vendor partitions in target zip generation""