Merge "Support signing custom_images with AVB"