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

Change-Id: Ibc8f3423ebceb417effeb3ecf8eec44d33d4dbaf