Merge changes from topic "libhardware_vndk"
* changes:
Build tv_input.default.vendor with BOARD_VNDK_VERSION
Build fingerprint.default with BOARD_VNDK_VERSION
Build power.default with BOARD_VNDK_VERSION
Build local_time.default with BOARD_VNDK_VERSION
Build nfc.default with BOARD_VNDK_VERSION
Build vr.default with BOARD_VNDK_VERSION
Build vibrator.default.vendor with BOARD_VNDK_VERSION
Build audio.usb.default with BOARD_VNDK_VERSION
Build vehicle.default with BOARD_VNDK_VERSION
Build audio.primary.default, audio.stub.default, audio_policy.stub with BOARD_VNDK_VERSION
Build radio.fm.default.vendor with BOARD_VNDK_VERSION
Build consumerir.default with BOARD_VNDK_VERSION
diff --git a/include/hardware/thermal.h b/include/hardware/thermal.h
index b5b6e1d..5db6ee0 100644
--- a/include/hardware/thermal.h
+++ b/include/hardware/thermal.h
@@ -19,6 +19,7 @@
#include <stdbool.h>
#include <stdint.h>
+#include <float.h>
#include <sys/cdefs.h>
#include <sys/types.h>
diff --git a/modules/hwcomposer/hwcomposer.cpp b/modules/hwcomposer/hwcomposer.cpp
index fd4e90d..31e362a 100644
--- a/modules/hwcomposer/hwcomposer.cpp
+++ b/modules/hwcomposer/hwcomposer.cpp
@@ -17,6 +17,7 @@
#include <errno.h>
#include <fcntl.h>
#include <malloc.h>
+#include <string.h>
#include <cutils/atomic.h>
#include <log/log.h>
diff --git a/modules/local_time/local_time_hw.c b/modules/local_time/local_time_hw.c
index b38d8a5..a2d1a9e 100644
--- a/modules/local_time/local_time_hw.c
+++ b/modules/local_time/local_time_hw.c
@@ -21,7 +21,7 @@
#include <malloc.h>
#include <stdint.h>
#include <string.h>
-#include <sys/time.h>
+#include <time.h>
#include <log/log.h>