Layered component for web payments

components/payments/content/android/BUILD.gn

Index: components/payments/content/android/BUILD.gn
diff --git a/components/payments/android/BUILD.gn b/components/payments/content/android/BUILD.gn
similarity index 71%
rename from components/payments/android/BUILD.gn
rename to components/payments/content/android/BUILD.gn
index a1949e547dfce4af8a275e17fd53f43536a08cbe..8dafb9b75d61aaf8fd678c1d1a5a8ecba8196364 100644
--- a/components/payments/android/BUILD.gn
+++ b/components/payments/content/android/BUILD.gn
@@ -5,17 +5,19 @@
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 
-static_library("payments_jni") {
+static_library("android") {
   sources = [
     "currency_formatter_android.cc",
     "currency_formatter_android.h",
-    "payments_jni_registrar.cc",
+    "payment_details_validation_android.cc",
+    "payment_details_validation_android.h",
   ]
   deps = [
     ":jni_headers",
     "//base",
-    "//components/payments:payment_request",
-    "//components/payments:payment_validation",
+    "//components/payments/content:payment_request",
+    "//components/payments/content:payment_validation",
+    "//components/payments/core",
   ]
 }