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

Change-Id: I7b3911287e89b3d58db2c1095dff6a4d9ba0b492