[Android] Implement generic JSON results that match base/test/launcher.

build/android/pylib/results/report_results.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Module containing utility functions for reporting results."""
 
 import logging
 import os
 import re
 
 from pylib import constants
-from pylib.utils import flakiness_dashboard_results_uploader
+from pylib.results.flakiness_dashboard import results_uploader
 
 
 def _LogToFile(results, test_type, suite_name):
   """Log results to local files which can be used for aggregation later."""
   log_file_path = os.path.join(constants.GetOutDirectory(), 'test_logs')
   if not os.path.exists(log_file_path):
     os.mkdir(log_file_path)
   full_file_name = os.path.join(
       log_file_path, re.sub(r'\W', '_', test_type).lower() + '.log')
   if not os.path.exists(full_file_name):
@@ skipping 28 matching lines @@
       else:
         dashboard_test_type = 'Chromium_Android_Instrumentation'
 
     elif test_type == 'Unit test':
       dashboard_test_type = test_package
 
     else:
       logging.warning('Invalid test type')
       return
 
-    flakiness_dashboard_results_uploader.Upload(
+    results_uploader.Upload(
         results, flakiness_server, dashboard_test_type)
 
   except Exception as e:
     logging.error(e)
 
 
 def LogFull(results, test_type, test_package, annotation=None,
             flakiness_server=None):
   """Log the tests results for the test suite.
 
@@ skipping 31 matching lines @@
     # instrumenation test package using different annotations.
     if annotation and len(annotation) == 1:
       suite_name = annotation[0]
     else:
       suite_name = test_package
     _LogToFile(results, test_type, suite_name)
 
     if flakiness_server:
       _LogToFlakinessDashboard(results, test_type, test_package,
                                flakiness_server)