Merge changes I0c16f2e1,Ifb8722b1 into main

* changes:
  Add script for mixing shared system images with a super image
  Refactor repack_super_image.py