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

Change-Id: I762464f8e01b23a9973c39c0397b278cc1899737