Merge "move /vendor VINTF data to /vendor/etc/vintf"