Merge "db845c: add super.img to update image"