am 70c6c9a1: Fix simulator build - missing header file <string.h> - need to define -D__arm__

Merge commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4' into gingerbread-plus-aosp

* commit '70c6c9a1e2240e82d8eb442b34efa9629ef2bba4':
  Fix simulator build

media/libstagefright/codecs/avc/enc/Android.mk

@@ -29,6 +29,7 @@ LOCAL_C_INCLUDES := \
     $(TOP)/frameworks/base/media/libstagefright/include
 
 LOCAL_CFLAGS := \
+    -D__arm__ \
     -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=
 
 include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/avc/enc/src/avcenc_api.h

@@ -28,6 +28,9 @@ and necessary type defitionitions and enumerations.
 #include "avcapi_common.h"
 #endif
 
+// For memset, etc
+#include <string.h>
+
 /**
  This enumeration is used for the status returned from the library interface.
 */