Merge "bundle files related to sdk dev tool with generated docs."
diff --git a/java/droiddoc.go b/java/droiddoc.go
index bdf7f53..6a5758b 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -904,7 +904,7 @@
 		}
 
 		if Bool(d.properties.Write_sdk_values) {
-			opts += " -sdkvalues " + android.PathForModuleOut(ctx, "docs").String()
+			opts += " -sdkvalues " + android.PathForModuleOut(ctx, "docs", "out").String()
 		}
 
 		var postDoclavaCmds string