Merge 6dbfdab20dc3177cc259d2bb0c5abc5df40ec5e7 on remote branch

Change-Id: Iab2597dd0b880012d0ef91963d346801072a7e37
diff --git a/rules/android_library/impl.bzl b/rules/android_library/impl.bzl
index cd7e2c0..286d7b5 100644
--- a/rules/android_library/impl.bzl
+++ b/rules/android_library/impl.bzl
@@ -216,7 +216,7 @@
             exports = utils.collect_providers(DataBindingV2Info, ctx.attr.exports),
             data_binding_exec = get_android_toolchain(ctx).data_binding_exec.files_to_run,
             data_binding_annotation_processor =
-                get_android_toolchain(ctx).data_binding_annotation_processor[JavaInfo],
+                get_android_toolchain(ctx).data_binding_annotation_processor[JavaPluginInfo],
             data_binding_annotation_template =
                 utils.only(get_android_toolchain(ctx).data_binding_annotation_template.files.to_list()),
         ),