diff --git a/Makefile b/Makefile
index de40861ad16..4e1d4bdf477 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ linux-prepare-$(LINUX_DISTRO)::
 linux-prepare-$(LINUX_DISTRO)-$(LINUX_DISTRO_RELEASE)::
 endif
 
-run-all-tests: run-nunit-tests run-apk-tests
+run-all-tests: run-nunit-tests run-ji-tests run-apk-tests
 
 clean:
 	$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean Xamarin.Android.sln
@@ -165,6 +165,11 @@ endef
 run-nunit-tests: $(NUNIT_TESTS)
 	$(foreach t,$(NUNIT_TESTS), $(call RUN_NUNIT_TEST,$(t),1))
 
+run-ji-tests:
+	$(MAKE) -C "$(call GetPath,JavaInterop)" CONFIGURATION=$(CONFIGURATION) all
+	ANDROID_SDK_PATH="$(call GetPath,AndroidSdk)" $(MAKE) -C "$(call GetPath,JavaInterop)" CONFIGURATION=$(CONFIGURATION) run-all-tests || true
+	cp "$(call GetPath,JavaInterop)"/TestResult-*.xml .
+
 # .apk files to test on-device need to:
 # (1) Have their .csproj files listed here
 # (2) Add a `@(UnitTestApk)` entry to `tests/RunApkTests.targets`
diff --git a/build-tools/android-toolchain/android-toolchain.projitems b/build-tools/android-toolchain/android-toolchain.projitems
index 0ec3febdd4e..725030eb600 100644
--- a/build-tools/android-toolchain/android-toolchain.projitems
+++ b/build-tools/android-toolchain/android-toolchain.projitems
@@ -90,6 +90,10 @@
       <HostOS></HostOS>
       <DestDir>extras\android\m2repository</DestDir>
     </AndroidSdkItem>
+    <AndroidSdkItem Include="docs-24_r01.zip">
+      <HostOS></HostOS>
+      <DestDir>docs</DestDir>
+    </AndroidSdkItem>
     <AndroidSdkItem Include="sysimg_x86-21_r03.zip">
       <HostOS></HostOS>
       <RelUrl>sys-img/android/</RelUrl>
diff --git a/external/Java.Interop b/external/Java.Interop
index 5eeb287b890..8d7060d1372 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 5eeb287b890805488949658d2df07bbd2a492687
+Subproject commit 8d7060d1372104ed75dc3550ab904a702298f0a6