Merge "Cleanup: move VINTF fragment into VAPEX" into main