| Index: build/android/pylib/flag_changer.py
 | 
| diff --git a/build/android/pylib/flag_changer.py b/build/android/pylib/flag_changer.py
 | 
| index 9ccdc1eb7ea1befea1c358aacdacc8ff8fb45c34..c1ce16a5e1e53120f926716ea7e72e478c656292 100644
 | 
| --- a/build/android/pylib/flag_changer.py
 | 
| +++ b/build/android/pylib/flag_changer.py
 | 
| @@ -114,7 +114,8 @@ class FlagChanger(object):
 | 
|        assert len(file_contents) == 1 and file_contents[0] == cmd_line, (
 | 
|            'Failed to set the command line file at %s' % self._cmdline_file)
 | 
|      else:
 | 
| -      self._device.RunShellCommand('rm ' + self._cmdline_file, root=use_root)
 | 
| +      self._device.RunShellCommand('rm ' + self._cmdline_file,
 | 
| +                                   as_root=use_root)
 | 
|        assert (
 | 
|            not self._device.old_interface.FileExistsOnDevice(
 | 
|                self._cmdline_file)), (
 | 
| 
 |