Speculatively fix Android automerger

gyp/android_deps.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 # We tried adding this gyp file to the android directory at the root of
@@ skipping 13 matching lines @@
       {
         'includes': [
           '../platform_tools/android/gyp/dependencies.gypi',
         ],
       }, { # else skia_android_framework
         'cflags': [
           '-Wno-error'
         ],
         'targets': [
           {
-            'target_name': 'expat',
+            'target_name': 'expat_android',
             'type': 'none',
             'direct_dependent_settings': {
               'libraries' : [
                 '-lexpat',
               ],
             },
           },
           {
             'target_name': 'png',
             'type': 'none',
@@ skipping 44 matching lines @@
           },
           {
             'target_name': 'cpu_features',
             'type': 'none',
           },
         ],
       }
     ],
   ],
 }