[android] Add support for providing flags to instrumentation tests directly.

build/android/pylib/instrumentation/instrumentation_test_instance.py

Index: build/android/pylib/instrumentation/instrumentation_test_instance.py
diff --git a/build/android/pylib/instrumentation/instrumentation_test_instance.py b/build/android/pylib/instrumentation/instrumentation_test_instance.py
index 93e3a63380d72855f60dfc0246adb3c5c774e230..dfe68b6a502f15421d0f9802a25b570f682e7040 100644
--- a/build/android/pylib/instrumentation/instrumentation_test_instance.py
+++ b/build/android/pylib/instrumentation/instrumentation_test_instance.py
@@ -639,11 +639,8 @@ class InstrumentationTestInstance(test_instance.TestInstance):
 
   def _initializeFlagAttributes(self, args):
     self._flags = ['--enable-test-intents']
-    # TODO(jbudorick): Transition "--device-flags" to "--device-flags-file"
     if hasattr(args, 'device_flags') and args.device_flags:
-      with open(args.device_flags) as device_flags_file:
-        stripped_lines = (l.strip() for l in device_flags_file)
-        self._flags.extend([flag for flag in stripped_lines if flag])
+      self._flags.extend(args.device_flags.split())
     if hasattr(args, 'device_flags_file') and args.device_flags_file:
       with open(args.device_flags_file) as device_flags_file:
         stripped_lines = (l.strip() for l in device_flags_file)