Merge "Flash super partition with fastboot flashall" am: 10601fd512
am: cb10dca496

Change-Id: I3da9d15417eaea470af890e5dd81cc7a32df8147