Merge "Don't rely on transitively included headers"

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>
 

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>

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>