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

Change-Id: I76c7a90649ab29f5b2f1494654545778eaf07179