Parameterize RU key for Camera Perf/Stress test

Framework performance & Stress tests use different RU keys
for a new Camera app since ivvavik

Change-Id: Id2e0eabe1563dd3993faf6a6f58d8f442305d93e
diff --git a/src/com/android/media/tests/Camera2StressTest.java b/src/com/android/media/tests/Camera2StressTest.java
index d0ddbba..13e3f08 100644
--- a/src/com/android/media/tests/Camera2StressTest.java
+++ b/src/com/android/media/tests/Camera2StressTest.java
@@ -59,7 +59,9 @@
     @Option(name = "test-timeout-ms", description = "Max time allowed in ms for a test run.")
     private int mTestTimeoutMs = 6 * 60 * 60 * 1000; // 6 hours
 
-    private String mRuKey = "camera_app_stress";
+    @Option(name = "ru-key", description = "Result key to use when posting to the dashboard.")
+    private String mRuKey = "CameraAppStress";
+
     private ITestDevice mDevice = null;
 
 
diff --git a/src/com/android/media/tests/CameraPerformanceTest.java b/src/com/android/media/tests/CameraPerformanceTest.java
index aee0316..086b37f 100644
--- a/src/com/android/media/tests/CameraPerformanceTest.java
+++ b/src/com/android/media/tests/CameraPerformanceTest.java
@@ -50,7 +50,9 @@
     private static final String TEST_PACKAGE_NAME = "com.android.cts.hardware";
     private static final String TEST_RUNNER_NAME =
             "android.support.test.runner.AndroidJUnitRunner";
-    private static final String RU_KEY = "camera_framework_performance";
+
+    @Option(name = "ru-key", description = "Result key to use when posting to the dashboard.")
+    private String RU_KEY = "CameraFrameworkPerformance";
 
     private final int MAX_TEST_TIMEOUT = 10 * 60 * 1000; // 10 mins