diff --git a/external/Java.Interop b/external/Java.Interop
index 7574f166008..fdc200cca56 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 7574f166008bb45c0df97315aae7907ac25f8602
+Subproject commit fdc200cca5676660dd8f732f4d7eef7716daa3df
diff --git a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
index 7d61a578409..0c986cf825f 100644
--- a/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
+++ b/src/Xamarin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Bindings.ClassParse.targets
@@ -19,9 +19,7 @@ This file is only used by binding projects.
       Outputs="$(ApiOutputFile)">
 
     <ItemGroup>
-      <!-- TODO: add when `ClassPath` supports `<api api-source="java-source-utils">`
       <_AndroidDocumentationPath Include="@(_JavaSourceJavadocXml)" />
-        -->
       <_AndroidDocumentationPath Include="@(JavaDocIndex->'%(RootDir)\%(Directory)')" />
       <_AndroidDocumentationPath Include="$(JavaDocPaths)" />
       <_AndroidDocumentationPath Include="$(Java7DocPaths)" />