Merge "Support repacking super image with virtual AB" am: 04d2e03be7 am: 2f5f0c7390 am: 1a146b8025 am: 35717dc475

Change-Id: I35908c78e058a9135cfc42a60ade0467a0e1fab5