BenchmarkPi: Updated for uiauto2 refactor

wa/workloads/benchmarkpi/uiauto/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.arm.wlauto.uiauto.benchmarkpi"
+    package="com.arm.wa.uiauto.benchmarkpi"
     android:versionCode="1"
     android:versionName="1.0">
 

wa/workloads/benchmarkpi/uiauto/app/src/main/java/com/arm/wa/uiauto/benchmarkpi/UiAutomation.java

@@ -33,6 +33,9 @@ public class UiAutomation extends BaseUiAutomation {
 
     public static String TAG = "benchmarkpi";
 
+    public Bundle parameters;
+    public String packageID;
+
     @Test
     public void runWorkload() throws Exception {
         startTest();

wa/workloads/benchmarkpi/uiauto/build.sh

@@ -29,7 +29,7 @@ if [[ ! -f gradlew ]]; then
     exit 9
 fi
 
-# Copy base class library from wlauto dist
+# Copy base class library from wa dist
 libs_dir=app/libs
 base_class=`python -c "import os, wa; print os.path.join(os.path.dirname(wa.__file__), 'framework', 'uiauto', 'uiauto.aar')"`
 mkdir -p $libs_dir