Ensure --disable-slimming-paint on Android

Tools/Scripts/webkitpy/layout_tests/port/android.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 162 matching lines @@
     def additional_resources(self):
         return ['content_resources.pak', 'content_shell.pak', 'shell_resources.pak']
 
     def command_line_file(self):
         return '/data/local/tmp/content-shell-command-line'
 
     def device_crash_dumps_directory(self):
         return '/data/local/tmp/content-shell-crash-dumps'
 
     def additional_command_line_flags(self, use_breakpad):
-        flags = ['--run-layout-test', '--encode-binary']
+        flags = ['--encode-binary']
         if use_breakpad:
             flags.extend(['--enable-crash-reporter', '--crash-dumps-dir=%s' % self.device_crash_dumps_directory()])
         return flags
 
     def device_directory(self):
         return DEVICE_SOURCE_ROOT_DIR + 'content_shell/'
 
 
 # The AndroidCommands class encapsulates commands to communicate with an attached device.
 class AndroidCommands(object):
@@ skipping 260 matching lines @@
     def path_to_forwarder(self):
         return self._build_path('forwarder')
 
     def path_to_md5sum(self):
         return self._build_path(MD5SUM_DEVICE_FILE_NAME)
 
     def path_to_md5sum_host(self):
         return self._build_path(MD5SUM_HOST_FILE_NAME)
 
     def additional_driver_flag(self):
-        return self._driver_details.additional_command_line_flags(use_breakpad=not self.get_option('disable_breakpad'))
+        return super(AndroidPort, self).additional_driver_flag() + self._driver_details.additional_command_line_flags(use_breakpad=not self.get_option('disable_breakpad'))
 
     def default_timeout_ms(self):
         # Android platform has less computing power than desktop platforms.
         # Using 10 seconds allows us to pass most slow tests which are not
         # marked as slow tests on desktop platforms.
         return 10 * 1000
 
     def driver_stop_timeout(self):
         # The driver doesn't respond to closing stdin, so we might as well stop the driver immediately.
         return 0.0
@@ skipping 811 matching lines @@
         return command
 
     def _read_prompt(self, deadline):
         last_char = ''
         while True:
             current_char = self._server_process.read_stdout(deadline, 1)
             if current_char == ' ':
                 if last_char in ('#', '$'):
                     return
             last_char = current_char