Instead of using the same delivery system for both Annex A and
Annex C, split them into two separate ones. This helps to support
devices that only support Annex A.
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>