Inline content_[tests/browser/android].gypi into GN build.

content/browser/cache_storage/cache_storage_proto.gyp

Index: content/browser/cache_storage/cache_storage_proto.gyp
diff --git a/content/browser/cache_storage/cache_storage_proto.gyp b/content/browser/cache_storage/cache_storage_proto.gyp
deleted file mode 100644
index cdbce1599683cdd93bf140942a25b07f4a54757d..0000000000000000000000000000000000000000
--- a/content/browser/cache_storage/cache_storage_proto.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  'targets': [
-    {
-      # GN version: //content/browser/cache_storage:cache_storage_proto
-      'target_name': 'cache_storage_proto',
-      'type': 'static_library',
-      'sources': [
-        'cache_storage.proto',
-      ],
-      'variables': {
-        'proto_in_dir': '.',
-        'proto_out_dir': 'content/browser/cache_storage',
-      },
-      'includes': [ '../../../build/protoc.gypi' ]
-    },
-  ],
-}