Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken

media/libeffects/EffectEqualizer.cpp

@@ -20,6 +20,7 @@
 #include <cutils/log.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 #include <new>
 #include "AudioEqualizer.h"
 #include "AudioBiquadFilter.h"

media/libeffects/EffectsFactory.c

@@ -18,6 +18,8 @@
 //#define LOG_NDEBUG 0
 
 #include "EffectsFactory.h"
+#include <string.h>
+#include <stdlib.h>
 #include <dlfcn.h>
 
 
@@ -277,7 +279,7 @@ int EffectLoadLibrary(const char *libPath, int *handle)
     if (ret < 0) {
         return ret;
     }
-    if (libPath == NULL || strnlen(libPath, PATH_MAX) >= PATH_MAX) {
+    if (libPath == NULL) {
         return -EINVAL;
     }
     return loadLibrary(libPath, handle);