Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.08.00.00.385.300' into pi-dev

Conflicts:
	Android.mk

Bug: 79367535
Change-Id: I52220ffa75df9482252ffd69d18c53e74dc84711

2 files changed, 2 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
index 6e43edd..1c80f3b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_C_INCLUDES := $(TARGET_BOARD_COMMON_PATH)/thermal-engine
+LOCAL_HEADER_LIBRARIES := libThermal_headers
 LOCAL_MODULE := vr.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
diff --git a/vr.c b/vr.c
index d8e2d03..87fd4bf 100644
--- a/vr.c
+++ b/vr.c
@@ -29,7 +29,7 @@
 #include <hardware/vr.h>
 #include <hardware/hardware.h>
 
-#include "thermal_client.h"
+#include <thermal_client.h>
 #include "vr_int.h"