Merge "Add repack_super_image" am: 2220e76f32 am: 73674013a4

Change-Id: Ibfb0d3ee2a85b763ebafdb62f50b9f3cb5466a3e