Merge "target: init: Add support for system-As-Root on non-A/B for VB1/VB2 targets."