Revert of Remove Android SampleApp

gyp/SampleApp.gyp

Index: gyp/SampleApp.gyp
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index beaaeca0f254edfd4c9cac49fb5b3a761e5ad4f5..347af56073c1df5c4316236f3c1cac67f7d150bb 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -114,6 +114,23 @@
             '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
           ],
         }],
+        [ 'skia_os == "android"', {
+          'conditions': [
+            ['skia_android_framework == 0', {
+              'dependencies': [
+                'android_deps.gyp:Android_EntryPoint',
+                'skia_launcher.gyp:skia_launcher',
+              ],
+            }],
+          ],
+          'dependencies!': [
+            'experimental.gyp:experimental',
+          ],
+          'dependencies': [
+            'android_output.gyp:android_output',
+            'android_deps.gyp:Android_SampleApp',
+          ],
+        }],
         [ 'skia_gpu == 1', {
           'dependencies': [
             'gputest.gyp:skgputest',