Fix simulator build again.

Change-Id: Ifd204d64eaa4c356422e3363ec0a6e6aa61c52dc
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index a2fcc41..54829a2d 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -1,6 +1,3 @@
-# Does not build for the simulator
-ifneq ($(TARGET_SIMULATOR), true)
-
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -23,5 +20,3 @@
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
-
-endif #simulator
diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp
index b1eb701..68b245b 100644
--- a/libs/hwui/Matrix.cpp
+++ b/libs/hwui/Matrix.cpp
@@ -18,6 +18,7 @@
 
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <utils/Log.h>