update gyp for ARM builds to be more well defined.

platform_tools/android/gyp/skia_android.gypi

 {
   'targets': [
     {
       'target_name': 'CopySkiaAppDeps',
       'type': 'none',
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'SampleApp.gyp:SampleApp',
         'bench.gyp:bench',
         'gm.gyp:gm',
         'tests.gyp:tests',
         'pathops_unittest.gyp:pathops_unittest',
         'tools.gyp:bench_pictures',
         'tools.gyp:render_pictures',
         'tools.gyp:render_pdfs',
         'tools.gyp:skimage',
       ],
       'variables': {
         'conditions': [
           [ 'skia_arch_type == "x86"', {
             'android_arch%': "x86",
           }, {
             'conditions': [
-              [ 'armv7', {
+              [ 'arm_version == 7', {
                 'android_arch%': "armeabi-v7a",
               }, {
                'android_arch%': "armeabi",
               }],
             ],
           }],
         ],
       },
       'copies': [
         # Copy gdbserver into the lib.target directory, so that it gets packaged
@@ skipping 73 matching lines @@
             '-Dnative.libs.absolute.dir=<(PRODUCT_DIR)/android/libs',
             '-Dout.final.file=<(PRODUCT_DIR)/android/bin/SkiaAndroid.apk',
             '-Dsdk.dir=<(ANDROID_SDK_ROOT)',
             'debug',
           ],
         },
       ],
     },
   ],
 }