diff --git a/android/variable.go b/android/variable.go
index 6815438..8491b69 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -98,6 +98,11 @@
 		Uml struct {
 			Cppflags []string
 		}
+
+		Arc struct {
+			Exclude_srcs []string
+			Static_libs  []string
+		}
 	} `android:"arch_variant"`
 }
 
@@ -160,6 +165,7 @@
 	Treble                     *bool `json:",omitempty"`
 	Pdk                        *bool `json:",omitempty"`
 	Uml                        *bool `json:",omitempty"`
+	Arc                        *bool `json:",omitempty"`
 	MinimizeJavaDebugInfo      *bool `json:",omitempty"`
 
 	IntegerOverflowExcludePaths *[]string `json:",omitempty"`
diff --git a/cc/config/global.go b/cc/config/global.go
index 4734498..118e26b 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -184,7 +184,7 @@
 	// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help
 	// with this, since there is no associated library.
 	pctx.PrefixedExistentPathsForSourcesVariable("CommonNativehelperInclude", "-I",
-		[]string{"libnativehelper/include_deprecated"})
+		[]string{"libnativehelper/include_jni"})
 
 	pctx.SourcePathVariable("ClangDefaultBase", ClangDefaultBase)
 	pctx.VariableFunc("ClangBase", func(config android.Config) (string, error) {
diff --git a/cc/pgo.go b/cc/pgo.go
index 9fea154..bc672e5 100644
--- a/cc/pgo.go
+++ b/cc/pgo.go
@@ -28,7 +28,7 @@
 	profileUseOtherFlags = []string{"-Wno-backend-plugin"}
 )
 
-const pgoProfileProject = "toolchain/pgo-profiles"
+const pgoProfileProject = "vendor/google_data/pgo_profile"
 
 const profileInstrumentFlag = "-fprofile-generate=/data/local/tmp"
 const profileSamplingFlag = "-gline-tables-only"