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

Change-Id: I48f9043a03ca72c6e90afa92db4f891ec12da1d4