Renamed collected files for VINTF.

APFE uses file names, not directories, to distinguish
files.

Test: m cts -j && cts-tradefed run cts -m Gesture --test
android.gesture.cts.GestureTest#testGetStrokes

Fixes: 28656227
Change-Id: Ibba886552a2870999a227ccebe59d62398bba364
diff --git a/tools/cts-tradefed/res/config/cts-device-files.xml b/tools/cts-tradefed/res/config/cts-device-files.xml
index e558a56..b8031f4 100644
--- a/tools/cts-tradefed/res/config/cts-device-files.xml
+++ b/tools/cts-tradefed/res/config/cts-device-files.xml
@@ -18,31 +18,31 @@
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/sys/fs/selinux/policy" />
-        <option name="dest-file" value="selinux-files/policy"/>
+        <option name="dest-file" value="vintf-files/sepolicy"/>
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/system/manifest.xml" />
-        <option name="dest-file" value="vintf-files/system/manifest.xml"/>
+        <option name="dest-file" value="vintf-files/framework_manifest.xml"/>
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/system/compatibility_matrix.xml" />
-        <option name="dest-file" value="vintf-files/system/compatibility_matrix.xml"/>
+        <option name="dest-file" value="vintf-files/framework_compatibility_matrix.xml"/>
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/vendor/manifest.xml" />
-        <option name="dest-file" value="vintf-files/vendor/manifest.xml"/>
+        <option name="dest-file" value="vintf-files/device_manifest.xml"/>
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/vendor/compatibility_matrix.xml" />
-        <option name="dest-file" value="vintf-files/vendor/compatibility_matrix.xml"/>
+        <option name="dest-file" value="vintf-files/device_compatibility_matrix.xml"/>
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceFileCollector">
         <option name="src-file" value="/proc/config.gz" />
-        <option name="dest-file" value="vintf-files/proc/config.gz"/>
+        <option name="dest-file" value="vintf-files/proc_config.gz"/>
     </target_preparer>
 </configuration>