NOT FOR SUBMITTING: Enable FFmpeg and VDA on Android (just for developing)

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 53e80432730b2648ee69727f300b8de92ac483a8..cdee65e04238a446e8312fe3b3c3b1e32df474d2 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -10,7 +10,7 @@
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     'conditions': [
-      ['OS == "android" or OS == "ios"', {
+      ['OS == "Xandroid" or OS == "ios"', {
         # Android and iOS don't use ffmpeg.
         'use_ffmpeg%': 0,
       }, {  # 'OS != "android" and OS != "ios"'
@@ -453,9 +453,9 @@
           },
         }],
         ['OS == "android"', {
-          'sources': [
-            'base/media_stub.cc',
-          ],
+          #'sources': [
+          #  'base/media_stub.cc',
+          #],
           'link_settings': {
             'libraries': [
               '-lOpenSLES',