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

Change-Id: I746219ee28fbd5b2284da4a1cdd36b6bf18e4933