DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master

Bug: 124234733
Change-Id: Ie8a6a0a0139e4a6821288af1aa4d0a9d4b277143
diff --git a/core/Android.mk b/core/Android.mk
index fca66b4..49224b1 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -20,7 +20,8 @@
     libutils \
     libcutils \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     MsgTask.cpp \
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk
index 0ebf6bb..97f7331 100644
--- a/loc_api/libloc_api_50001/Android.mk
+++ b/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -75,7 +76,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
 endif
diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk
index 19f6cad..2321745 100644
--- a/msm8084/core/Android.mk
+++ b/msm8084/core/Android.mk
@@ -15,7 +15,8 @@
     liblog \
     libcutils \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     MsgTask.cpp \
diff --git a/msm8084/loc_api/libloc_api_50001/Android.mk b/msm8084/loc_api/libloc_api_50001/Android.mk
index acb4f4f..674383f 100644
--- a/msm8084/loc_api/libloc_api_50001/Android.mk
+++ b/msm8084/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -75,7 +76,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc.cpp \
diff --git a/msm8909/loc_api/libloc_api_50001/Android.mk b/msm8909/loc_api/libloc_api_50001/Android.mk
index 3bc9b4c..ef9accb 100644
--- a/msm8909/loc_api/libloc_api_50001/Android.mk
+++ b/msm8909/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -76,7 +77,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
 endif
diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk
index 2ef9bf0..0f9b05f 100644
--- a/msm8909/utils/Android.mk
+++ b/msm8909/utils/Android.mk
@@ -10,7 +10,8 @@
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libcutils \
-    liblog
+    liblog \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_log.cpp \
diff --git a/msm8909w_3100/utils/Android.mk b/msm8909w_3100/utils/Android.mk
index 637f154..5cd4c1b 100644
--- a/msm8909w_3100/utils/Android.mk
+++ b/msm8909w_3100/utils/Android.mk
@@ -12,7 +12,8 @@
     libutils \
     libcutils \
     liblog \
-    libloc_pla
+    libloc_pla \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_log.cpp \
diff --git a/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index ab13717..82016a5 100644
--- a/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8909w_3100/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -29,7 +29,8 @@
     libutils \
     libcutils \
     liblog \
-    libloc_stub
+    libloc_stub \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
         platform_lib_gettid.cpp \
diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk
index 46b09c8..b32d589 100644
--- a/msm8960/core/Android.mk
+++ b/msm8960/core/Android.mk
@@ -12,7 +12,8 @@
     liblog \
     libcutils \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     MsgTask.cpp \
diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk
index fe35293..d8f1b0d 100644
--- a/msm8960/loc_api/libloc_api_50001/Android.mk
+++ b/msm8960/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -75,7 +76,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc.cpp \
diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk
index 51a8cfb..9758c6f 100644
--- a/msm8994/core/Android.mk
+++ b/msm8994/core/Android.mk
@@ -21,7 +21,8 @@
     liblog \
     libcutils \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     MsgTask.cpp \
diff --git a/msm8994/loc_api/libloc_api_50001/Android.mk b/msm8994/loc_api/libloc_api_50001/Android.mk
index 0ebf6bb..97f7331 100644
--- a/msm8994/loc_api/libloc_api_50001/Android.mk
+++ b/msm8994/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -75,7 +76,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
 endif
diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk
index 63204da..3c23636 100644
--- a/msm8996/loc_api/libloc_api_50001/Android.mk
+++ b/msm8996/loc_api/libloc_api_50001/Android.mk
@@ -17,7 +17,8 @@
     libdl \
     liblog \
     libloc_core \
-    libgps.utils
+    libgps.utils \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
     loc_eng.cpp \
@@ -75,7 +76,8 @@
     libloc_eng \
     libloc_core \
     libgps.utils \
-    libdl
+    libdl \
+    libprocessgroup
 
 ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
 endif
diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk
index 691d494..e0b9b32 100644
--- a/msm8996/utils/Android.mk
+++ b/msm8996/utils/Android.mk
@@ -10,7 +10,8 @@
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libcutils \
-    liblog
+    liblog \
+    libprocessgroup
 
 LOCAL_HEADER_LIBRARIES := \
     libhardware_headers
diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index 87d5a1e..2eb7b1b 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -11,7 +11,8 @@
     libutils \
     libcutils \
     liblog \
-    libloc_stub
+    libloc_stub \
+    libprocessgroup
 
 LOCAL_SRC_FILES += \
         platform_lib_gettid.cpp \