Additional cleanups to Android config parsing.

platform_tools/android/gyp/dependencies.gypi

 # 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.
 #
 # NOTE: We tried adding the gyp file to the android/ directory at the root of
 # the Skia repo, but that resulted in the generated makefiles being created
 # outside of the out directory. We may be able to move the bulk of this gyp
 # to the /android directory and put a simple shim here, but that has yet to be
 # tested.
 
@@ skipping 26 matching lines @@
         '../third_party/externals/expat/lib/xmlrole.c',
         '../third_party/externals/expat/lib/xmltok.c',
       ],
       'include_dirs': [
         '../third_party/externals/expat',
         '../third_party/externals/expat/lib',
       ],
       'cflags': [
         '-w',
         '-fexceptions',
-        '-DHAVE_EXPAT_CONFIG_H',
+      ],
+      'defines': [
+        'HAVE_EXPAT_CONFIG_H',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../third_party/externals/expat/lib',  # For expat.h
         ],
       }
     },
     {
       'target_name': 'gif',
       'type': 'static_library',
@@ skipping 175 matching lines @@
           }],
         ],
         'sources': [
           '../app/jni/com_skia_SkiaSampleRenderer.cpp',
         ],
       },
 
     },
   ]
 }