Merge "APEXs are signed with apk signer"
diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go
index a7d6e04..8177ff1 100644
--- a/cc/ndk_headers.go
+++ b/cc/ndk_headers.go
@@ -44,7 +44,7 @@
 )
 
 func init() {
-	pctx.HostBinToolVariable("versionerCmd", "versioner")
+	pctx.SourcePathVariable("versionerCmd", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/versioner")
 }
 
 // Returns the NDK base include path for use with sdk_version current. Usable with -I.