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

Change-Id: Ie9ce245de049bf33c7c7530309dd33681620740d