Check APK version and ABI when installing

- Check the APK's versionName property against the workload's
  expected version if specified
- If workload specifies check_abi param, try to get APK from
  ABI-specific path on the host
- Add variant_name param to APK resource-getter for backwards
  compatibility of dex2oat and peacekeeper

wlauto/workloads/dex2oat/__init__.py

@@ -53,7 +53,8 @@ class Dex2oatBenchmark(Workload):
     def init_resources(self, context):
         # TODO: find a better APK to use for this.
         peacekeeper = ExtensionLoader().get_workload('peacekeeper', self.device)
-        self.apk_file = context.resolver.get(wlauto.common.android.resources.ApkFile(peacekeeper), version='chrome')
+        self.apk_file = context.resolver.get(wlauto.common.android.resources.ApkFile(peacekeeper),
+                                             variant_name='chrome')
         self.package = ApkInfo(self.apk_file).package
 
     def setup(self, context):
@@ -119,4 +120,3 @@ class Dex2oatBenchmark(Workload):
 
     def teardown(self, context):
         self.device.delete_file(self.on_device_oat)
-

wlauto/workloads/peacekeeper/__init__.py

@@ -63,7 +63,7 @@ class Peacekeeper(AndroidUiAutoBenchmark):
 
     def __init__(self, device, **kwargs):
         super(Peacekeeper, self).__init__(device, **kwargs)
-        self.version = self.browser
+        self.variant_name = self.browser
 
     def update_result(self, context):
         super(Peacekeeper, self).update_result(context)