Generate tests/Android.mk from gyp

gyp/apptype_console.gypi

 # target_defaults used for executable targets that generate a console app
 {
   'target_defaults': {
     'msvs_settings': {
       'VCLinkerTool': {
         #Allows for creation / output to console.
         #Console (/SUBSYSTEM:CONSOLE)
         'SubSystem': '1',
 
         #Console app, use main/wmain
         'EntryPointSymbol': 'mainCRTStartup',
       },
     },
     'conditions': [
-      [ 'skia_os == "android"', {
+      [ 'skia_os == "android" and not skia_android_framework', {
         'dependencies': [
           'android_deps.gyp:Android_EntryPoint',
           'android_system.gyp:skia_launcher',
         ],
       }],
       [ 'skia_os == "nacl"', {
         'dependencies': [
           'nacl.gyp:nacl_interface',
         ],
       }],
@@ skipping 38 matching lines @@
           '../experimental/SimpleiOSApp/iPad/MainWindow_iPad.xib',
           '../experimental/SimpleiOSApp/iPhone/MainWindow_iPhone.xib',
         ],
         'xcode_settings' : {
           'INFOPLIST_FILE' : '../experimental/SimpleiOSApp/tool-Info.plist',
         },
       }],
     ],
   },
 }