diff --git a/gen_headers_arm64_auto.bp b/gen_headers_arm64_auto.bp
index f63c31b8d3a2..6f7dc26505a2 100644
--- a/gen_headers_arm64_auto.bp
+++ b/gen_headers_arm64_auto.bp
@@ -990,22 +990,22 @@ gen_headers_out_arm64 = [
     "audio/sound/audio_compressed_formats.h",
     "audio/linux/mfd/wcd9xxx/wcd9320_registers.h",
     "audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h",
-    "media/msm_media_info.h",
-    "media/cam_isp_vfe.h",
-    "media/cam_sync.h",
-    "media/cam_lrme.h",
-    "media/cam_cpas.h",
-    "media/cam_defs.h",
-    "media/cam_isp_ife.h",
-    "media/cam_jpeg.h",
-    "media/cam_isp.h",
-    "media/ais_sensor.h",
-    "media/ais_v4l2loopback.h",
-    "media/ais_isp.h",
-    "media/cam_icp.h",
-    "media/cam_req_mgr.h",
-    "media/cam_sensor.h",
-    "media/cam_fd.h",
+    "ais/media/msm_media_info.h",
+    "ais/media/cam_isp_vfe.h",
+    "ais/media/cam_sync.h",
+    "ais/media/cam_lrme.h",
+    "ais/media/cam_cpas.h",
+    "ais/media/cam_defs.h",
+    "ais/media/cam_isp_ife.h",
+    "ais/media/cam_jpeg.h",
+    "ais/media/cam_isp.h",
+    "ais/media/ais_sensor.h",
+    "ais/media/ais_v4l2loopback.h",
+    "ais/media/ais_isp.h",
+    "ais/media/cam_icp.h",
+    "ais/media/cam_req_mgr.h",
+    "ais/media/cam_sensor.h",
+    "ais/media/cam_fd.h",
     "display/drm/msm_drm_pp.h",
     "display/drm/sde_drm.h",
     "display/linux/mdss_rotator.h",
diff --git a/gen_headers_arm_auto.bp b/gen_headers_arm_auto.bp
index 5dd2e0cdf017..02a912bd42c0 100644
--- a/gen_headers_arm_auto.bp
+++ b/gen_headers_arm_auto.bp
@@ -994,22 +994,22 @@ gen_headers_out_arm = [
     "audio/sound/audio_compressed_formats.h",
     "audio/linux/mfd/wcd9xxx/wcd9320_registers.h",
     "audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h",
-    "media/msm_media_info.h",
-    "media/cam_isp_vfe.h",
-    "media/cam_sync.h",
-    "media/cam_lrme.h",
-    "media/cam_cpas.h",
-    "media/cam_defs.h",
-    "media/cam_isp_ife.h",
-    "media/cam_jpeg.h",
-    "media/cam_isp.h",
-    "media/ais_sensor.h",
-    "media/ais_v4l2loopback.h",
-    "media/ais_isp.h",
-    "media/cam_icp.h",
-    "media/cam_req_mgr.h",
-    "media/cam_sensor.h",
-    "media/cam_fd.h",
+    "ais/media/msm_media_info.h",
+    "ais/media/cam_isp_vfe.h",
+    "ais/media/cam_sync.h",
+    "ais/media/cam_lrme.h",
+    "ais/media/cam_cpas.h",
+    "ais/media/cam_defs.h",
+    "ais/media/cam_isp_ife.h",
+    "ais/media/cam_jpeg.h",
+    "ais/media/cam_isp.h",
+    "ais/media/ais_sensor.h",
+    "ais/media/ais_v4l2loopback.h",
+    "ais/media/ais_isp.h",
+    "ais/media/cam_icp.h",
+    "ais/media/cam_req_mgr.h",
+    "ais/media/cam_sensor.h",
+    "ais/media/cam_fd.h",
     "display/drm/msm_drm_pp.h",
     "display/drm/sde_drm.h",
     "display/linux/mdss_rotator.h",