Implement InstanceIDAndroid using InstanceIDWithSubtype.java

components/gcm_driver/instance_id/BUILD.gn

Index: components/gcm_driver/instance_id/BUILD.gn
diff --git a/components/gcm_driver/instance_id/BUILD.gn b/components/gcm_driver/instance_id/BUILD.gn
index 3e7792959a34673eee636bf1ac636ed596799b33..ec00c0b3766433915e27b9ba8baa1e640e79097c 100644
--- a/components/gcm_driver/instance_id/BUILD.gn
+++ b/components/gcm_driver/instance_id/BUILD.gn
@@ -5,6 +5,8 @@
 # GYP version: components/gcm_driver.gypi:instance_id_driver
 source_set("instance_id") {
   sources = [
+    "android/component_jni_registrar.cc",
+    "android/component_jni_registrar.h",
     "instance_id.cc",
     "instance_id.h",
     "instance_id_driver.cc",
@@ -29,6 +31,7 @@ source_set("instance_id") {
       "instance_id_android.cc",
       "instance_id_android.h",
     ]
+    deps += [ "android:jni_headers" ]
   }
 }