Android: splits cache_control and perf_control.

tools/telemetry/telemetry/core/platform/android_platform_backend.py

Index: tools/telemetry/telemetry/core/platform/android_platform_backend.py
diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
index b38a0fbb338ad81b9ac4dff7c238e11f61690021..8d65bf078a082dc9366051b56315f15089397ec6 100644
--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
@@ -11,11 +11,12 @@ from telemetry.core.platform import proc_util
 
 # Get build/android scripts into our path.
 util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
-from pylib import perf_tests_helper  # pylint: disable=F0401
-from pylib import thermal_throttle  # pylint: disable=F0401
+from pylib.perf import cache_control  # pylint: disable=F0401
+from pylib.perf import perf_control  # pylint: disable=F0401
+from pylib.perf import thermal_throttle  # pylint: disable=F0401
 
 try:
-  from pylib import surface_stats_collector  # pylint: disable=F0401
+  from pylib.perf import surface_stats_collector  # pylint: disable=F0401
 except Exception:
   surface_stats_collector = None
 
@@ -25,7 +26,7 @@ class AndroidPlatformBackend(platform_backend.PlatformBackend):
     super(AndroidPlatformBackend, self).__init__()
     self._adb = adb
     self._surface_stats_collector = None
-    self._perf_tests_setup = perf_tests_helper.PerfControl(self._adb)
+    self._perf_tests_setup = perf_control.PerfControl(self._adb)
     self._thermal_throttle = thermal_throttle.ThermalThrottle(self._adb)
     self._no_performance_mode = no_performance_mode
     self._raw_display_frame_rate_measurements = []
@@ -139,8 +140,8 @@ class AndroidPlatformBackend(platform_backend.PlatformBackend):
     return False
 
   def FlushEntireSystemCache(self):
-    cache_control = perf_tests_helper.CacheControl(self._adb)
-    cache_control.DropRamCaches()
+    cache = cache_control.CacheControl(self._adb)
+    cache.DropRamCaches()
 
   def FlushSystemCacheForDirectory(self, directory, ignoring=None):
     raise NotImplementedError()