Merge master@5428150 into git_qt-dev-plus-aosp.

Change-Id: Ie41fcb9112bb8d3a92a6953917d44ce1d4c281d7
BUG: 129345239
diff --git a/sdm845/utils/Android.mk b/sdm845/utils/Android.mk
index 40882a7..d469371 100644
--- a/sdm845/utils/Android.mk
+++ b/sdm845/utils/Android.mk
@@ -14,6 +14,10 @@
     liblog \
     libprocessgroup
 
+ifeq ($(filter P% p%,$(TARGET_PLATFORM_VERSION)),)
+LOCAL_SHARED_LIBRARIES += libprocessgroup
+endif
+
 LOCAL_SRC_FILES += \
     loc_log.cpp \
     loc_cfg.cpp \
diff --git a/utils/Android.mk b/utils/Android.mk
index 9711d7e..f224b18 100644
--- a/utils/Android.mk
+++ b/utils/Android.mk
@@ -12,6 +12,10 @@
     libcutils \
     liblog
 
+ifeq ($(filter P% p%,$(TARGET_PLATFORM_VERSION)),)
+LOCAL_SHARED_LIBRARIES += libprocessgroup
+endif
+
 LOCAL_SRC_FILES += \
     loc_log.cpp \
     loc_cfg.cpp \