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

Change-Id: I29626ee58a743fd9f9c676df1ebf66e0b23ff917