--- old/make/MainSupport.gmk	2016-10-18 12:09:06.240321200 -0500
+++ new/make/MainSupport.gmk	2016-10-18 12:09:05.118259900 -0500
@@ -113,8 +113,15 @@
   $(call Clean-java, $1)
   $(call Clean-native, $1)
   $(call Clean-include, $1)
+  $(if $(subst jdk.accessibility,,$(strip $1)),,$(call CleanJavaAccessBridge))
 endef
 
+define CleanJavaAccessBridge
+	@$(PRINTF) "Cleaning javaaccessbridge for jdk.accessibility ..."
+	@$(PRINTF) "\n" $(LOG_DEBUG)
+	$(RM) -r $(SUPPORT_OUTPUTDIR)/modules_javaaccessbridge/jdk.accessibility
+	@$(PRINTF) " done\n"
+endef
 
 ################################################################################