[automerger skipped] Merge "Support repacking super image with virtual AB" into rvc-dev am: d9869c2a42 -s ours am: 53709736b0 -s ours am: aaff2186b4 -s ours am: f2a36f46a3 -s ours

am skip reason: Change-Id I03f33969d3c033a47cf123f94d875a4b56d2d343 with SHA-1 0071b427e4 is in history

Change-Id: Ic4e4a8cef98d0c23f4568af1d44d18c2f67d6a86