Merge "Prepare for move to prebuilts/build-tools"
diff --git a/Android.bp b/Android.bp
index 6bbd4d3..ee4a1f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -162,7 +162,7 @@
     defaults: ["bison_defaults"],
 
     cflags: [
-        "-DPKGDATADIR=\"external/bison/data\"",
+        "-DPKGDATADIR=\"prebuilts/build-tools/common/bison\"",
 
         "-Wno-sometimes-uninitialized",
         "-Wno-unused-parameter",