Followup Ia6bf604c, I431a9025: Update way VE target is constructed

Bug: T78710
Change-Id: Ifcb2a9859d30c623d68c94170034aaf58682ca96
Merge "Followup Ia6bf604c, I431a9025: Update way VE target is constructed"