merge in pi-release history after reset to master
diff --git a/hal/voice_extn/voice_extn.c b/hal/voice_extn/voice_extn.c
index c36a450..92b85b6 100644
--- a/hal/voice_extn/voice_extn.c
+++ b/hal/voice_extn/voice_extn.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
-#include <log/log.h>
+#include <cutils/log.h>
 #include <cutils/str_parms.h>
 #include <sys/ioctl.h>
 #include <sound/voice_params.h>