Merge "Add repack_super_image" am: 2220e76f32

Change-Id: I3a8b5b0b47fa212feb961356958e431da2ef1586