diff --git a/media/libstagefright/codecs/avc/enc/Android.mk b/media/libstagefright/codecs/avc/enc/Android.mk
index 735eb0c..100f239 100644
--- a/media/libstagefright/codecs/avc/enc/Android.mk
+++ b/media/libstagefright/codecs/avc/enc/Android.mk
@@ -29,6 +29,7 @@
     $(TOP)/frameworks/base/media/libstagefright/include
 
 LOCAL_CFLAGS := \
+    -D__arm__ \
     -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/media/libstagefright/codecs/avc/enc/src/avcenc_api.h b/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
index 628dec6..6841ec3 100644
--- a/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
+++ b/media/libstagefright/codecs/avc/enc/src/avcenc_api.h
@@ -28,6 +28,9 @@
 #include "avcapi_common.h"
 #endif
 
+// For memset, etc
+#include <string.h>
+
 /**
  This enumeration is used for the status returned from the library interface.
 */