Merge location.lnx.3.0-180201 to location.lnx.7.3.9

Catchup merge from tag location.lnx.3.0-18201

CRs-fixed: 2212182
Change-Id: I47f5f9eb06cb6a6ee6be337a2dc43e0d2386113b
diff --git a/sdm845/utils/log_util.h b/sdm845/utils/log_util.h
index d5884b7..460d6e7 100644
--- a/sdm845/utils/log_util.h
+++ b/sdm845/utils/log_util.h
@@ -37,13 +37,14 @@
 #elif defined (USE_GLIB)
 // LE targets with no logcat support
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <cutils/log.h>
 
 #ifndef LOG_TAG
 #define LOG_TAG "GPS_UTILS"
-
-#endif  // LOG_TAG
+#endif /* LOG_TAG */
 
 #endif /* #if defined (USE_ANDROID_LOGGING) || defined (ANDROID) */