Reland "Gyp file changes for the android framework."

gyp/core.gyp

 # Core Skia library code.
 {
   'targets': [
     {
       'target_name': 'core',
       'product_name': 'skia_core',
       'type': 'static_library',
       'standalone_static_library': 1,
       'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
 
@@ skipping 62 matching lines @@
         [ 'skia_os == "win"', {
           'include_dirs': [
             'config/win',
           ],
         }],
         [ 'skia_os == "android"', {
           'dependencies': [
             'android_deps.gyp:cpu_features',
           ],
         }],
+        [ 'skia_android_framework', {
+            'libraries': [
+              # Required for SkAtomics_android.h
+              '-lcutils',
+            ],
+        }],
         [ 'skia_arch_type == "arm"', {
           # The code in SkUtilsArm.cpp can be used on an ARM-based Linux system, not only Android.
           'sources': [
             '../src/core/SkUtilsArm.cpp',
             '../src/core/SkUtilsArm.h',
           ],
         }],
         ['skia_gpu == 1', {
           'include_dirs': [
               '../include/gpu',
@@ skipping 22 matching lines @@
           [ 'skia_os == "win"', {
             'include_dirs': [
               'config/win',
             ],
           }],
         ],
       },
     },
   ],
 }