Make battor_wrapper use target_platform instead of sys.platform

common/battor/battor/battor_wrapper.py

Index: common/battor/battor/battor_wrapper.py
diff --git a/common/battor/battor/battor_wrapper.py b/common/battor/battor/battor_wrapper.py
index be2359706a4b096fab12aee93c829008e23ceda0..b6ba4131acd373bb5c1a0a92eb489f49cabe70cd 100644
--- a/common/battor/battor/battor_wrapper.py
+++ b/common/battor/battor/battor_wrapper.py
@@ -119,8 +119,7 @@ class BattOrWrapper(object):
     self._dm = dependency_manager.DependencyManager(
         [dependency_manager.BaseConfig(config)])
     self._battor_agent_binary = self._dm.FetchPath(
-        'battor_agent_binary', '%s_%s' % (sys.platform, platform.machine()))
-
+        'battor_agent_binary', '%s_%s' % (target_platform, platform.machine()))

[nednguyen, 2017/01/05 21:15:15]

As said offline, this is a problem. We are using target_platform from the user
but using platform.machine() which is our logic. So theoretically, you can have:
target_platform = "Android"
platform.machine() = "x64"

And this combination doesn't make sense. So either:
1) The callsite needs to pass target_platform & target_archiecture
2) battor_wrapper is for managing binary on host machine only, it it will infer
the correct platform itself. In that case, the fix is as simple as converting
the variances of "linux", "linux2", "linux3"... to just the canonical form.

     self._autoflash = autoflash
     self._serial_log_bucket = serial_log_bucket
     self._tracing = False
@@ -381,7 +380,7 @@ class BattOrWrapper(object):
       return False
 
     avrdude_binary = self._dm.FetchPath(
-        'avrdude_binary', '%s_%s' % (sys.platform, platform.machine()))
+        'avrdude_binary', '%s_%s' % (self._target_platform, platform.machine()))
     avr_cmd = [
         avrdude_binary,
         '-e',  # Specify to erase data on chip.