04d821d flatpak_builder: handle labels => annotations, labels => both

Authored and Committed by otaylor 4 years ago
    flatpak_builder: handle labels => annotations, labels => both
    
    Instead of assuming that the source image has annotations, handle
    the case where the source image only has labels as well. Our new
    plan is that Flaptak 1.6 will break strict backwards compatibility
    and only generate images with metadata in labels.
    (See https://github.com/flatpak/flatpak/issues/3192)