Android: splits cache_control and perf_control.

build/android/surface_stats.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Command line tool for continuously printing Android graphics surface
 statistics on the console.
 """
 
 import collections
 import optparse
 import sys
 import time
 
-from pylib import android_commands, surface_stats_collector
+from pylib import android_commands
+from pylib.perf import surface_stats_collector
 from pylib.utils import run_tests_helper
 
 
 _FIELD_FORMAT = {
   'jank_count (janks)': '%d',
   'max_frame_delay (vsyncs)': '%d',
   'avg_surface_fps (fps)': '%.2f',
   'frame_lengths (vsyncs)': '%.3f',
   'refresh_period (seconds)': '%.6f',
 }
@@ skipping 96 matching lines @@
       _PrintResults(results)
       row_count += 1
   except KeyboardInterrupt:
     sys.exit(0)
   finally:
     collector.Stop()
 
 
 if __name__ == '__main__':
   main(sys.argv)