diff --git a/java/app.go b/java/app.go
index 6866e2a..ed6a9db 100644
--- a/java/app.go
+++ b/java/app.go
@@ -254,7 +254,7 @@
 	sdkVersion := String(a.deviceProperties.Sdk_version)
 	switch sdkVersion {
 	case "", "current", "system_current", "test_current":
-		sdkVersion = ctx.Config().AppsDefaultVersionName()
+		sdkVersion = proptools.NinjaEscape([]string{ctx.Config().AppsDefaultVersionName()})[0]
 	}
 
 	linkFlags = append(linkFlags, "--min-sdk-version "+sdkVersion)
diff --git a/java/config/config.go b/java/config/config.go
index 603d43f..ad2f0ae 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -147,5 +147,5 @@
 		})
 	}
 
-	hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilt/sdk/tools", "aapt2")
+	hostBinToolVariableWithPrebuilt("Aapt2Cmd", "prebuilts/sdk/tools", "aapt2")
 }