Merge "Support repacking super image with virtual AB" am: 04d2e03be7

Change-Id: Ib2697f93cdca0b0472445aecda796b9739271de3