Merge "custom_images: support verity fec (forward error correction)"