Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6

Change-Id: Ic336acbf09ed630cc1b20ea82796f20369b1a5dc

diff --cc android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
index bbcdd42,f994692..00c108b
--- 1/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
--- 2/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@@ -1436,15 -1443,13 +1436,15 @@@ public class DeqpTestRunner implements 
              deqpCmdLine.append(" --deqp-log-images=disable");
          }
  
 -        deqpCmdLine.append(" --deqp-watchdog=enable");
 +        if (!mDisableWatchdog) {
 +            deqpCmdLine.append(" --deqp-watchdog=enable");
 +        }
  
          final String command = String.format(
-                 "am instrument %s -w -e deqpLogFileName \"%s\" -e deqpCmdLine \"%s\""
+                 "am instrument %s -w -e deqpLogFilename \"%s\" -e deqpCmdLine \"%s\""
                      + " -e deqpLogData \"%s\" %s",
 -                AbiUtils.createAbiFlag(mAbi.getName()), LOG_FILE_NAME, deqpCmdLine.toString(),
 -                mLogData, instrumentationName);
 +                AbiUtils.createAbiFlag(mAbi.getName()), APP_DIR + LOG_FILE_NAME,
 +                deqpCmdLine.toString(), mLogData, instrumentationName);
  
          final int numRemainingInstancesBefore = getNumRemainingInstances();
          final InstrumentationParser parser = new InstrumentationParser(mInstanceListerner);