Change all cf_common paths to cuttlefish paths

Merging cuttlefish_common master into cuttlefish master

Bug: 143774116
Test: Treehugger
Exempt-From-Owner-Approval: cf-only change
Change-Id: I9911ba93e642ac1909be45334a5f45fc95a4ab48
Merged-In: I9911ba93e642ac1909be45334a5f45fc95a4ab48
diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk
index 7a53bc1..42edd92 100644
--- a/target/product/cfi-common.mk
+++ b/target/product/cfi-common.mk
@@ -17,7 +17,7 @@
 # This is a set of common components to enable CFI for (across
 # compatible product configs)
 PRODUCT_CFI_INCLUDE_PATHS :=  \
-    device/google/cuttlefish_common/guest/libs/wpa_supplicant_8_lib \
+    device/google/cuttlefish/guest/libs/wpa_supplicant_8_lib \
     device/google/wahoo/wifi_offload \
     external/tinyxml2 \
     external/wpa_supplicant_8 \