[Android] Fix x86 compilation with multiply defined command_line.cc

base/base.gypi

 # Copyright (c) 2012 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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 21 matching lines @@
           'allocator/allocator_extension.cc',
           'allocator/allocator_extension.h',
           'allocator/type_profiler_control.cc',
           'allocator/type_profiler_control.h',
           'android/activity_status.cc',
           'android/activity_status.h',
           'android/base_jni_registrar.cc',
           'android/base_jni_registrar.h',
           'android/build_info.cc',
           'android/build_info.h',
-          'android/command_line.cc',
-          'android/command_line.h',
+          'android/command_line_android.cc',
+          'android/command_line_android.h',
           'android/content_uri_utils.cc',
           'android/content_uri_utils.h',
           'android/cpu_features.cc',
           'android/fifo_utils.cc',
           'android/fifo_utils.h',
           'android/important_file_writer_android.cc',
           'android/important_file_writer_android.h',
           'android/scoped_java_ref.cc',
           'android/scoped_java_ref.h',
           'android/jni_android.cc',
@@ skipping 886 matching lines @@
           ['<(toolkit_uses_gtk) == 1', {
             'sources!': [
               'x11/x11_error_tracker.cc',
             ],
           }],
         ],
       }],
     ],
   },
 }