plus, moved VINTF fragments into VAPEX Bug: 296524155 Test: m Change-Id: I8adac4c00a98d1fd7c71aa92851567a35d9dabf3