Merge "Add selinux and verity support to custom image generation."