DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I53d77b0d3bdaef27681c33e7b453408c5575ff01
diff --git a/hal/Android.mk b/hal/Android.mk
index 236ed11..05455b5 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -110,6 +110,7 @@
 	libaudioutils \
 	liblog \
 	libcutils \
+	libprocessgroup \
 	libtinyalsa \
 	libtinycompress \
 	libaudioroute \
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f315b5e..731f444 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -40,10 +40,10 @@
 #include <cutils/str_parms.h>
 #include <cutils/properties.h>
 #include <cutils/atomic.h>
-#include <cutils/sched_policy.h>
 
 #include <hardware/audio_effect.h>
 #include <hardware/audio_alsaops.h>
+#include <processgroup/sched_policy.h>
 #include <system/thread_defs.h>
 #include <tinyalsa/asoundlib.h>
 #include <audio_effects/effect_aec.h>