Try to fix the simulator build.

Change-Id: I3640e9eba433e711e23af1c6182e38c86c5b60bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk
index f363b7c..3c9909b 100644
--- a/media/mtp/Android.mk
+++ b/media/mtp/Android.mk
@@ -15,8 +15,6 @@
 #
 LOCAL_PATH:= $(call my-dir)
 
-ifneq ($(TARGET_SIMULATOR),true)
-
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=                                       \
@@ -49,6 +47,8 @@
 
 include $(BUILD_STATIC_LIBRARY)
 
+ifneq ($(TARGET_SIMULATOR),true)
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=                                       \
@@ -65,8 +65,6 @@
 
 include $(BUILD_EXECUTABLE)
 
-endif
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := scantest
@@ -88,8 +86,9 @@
 LOCAL_C_INCLUDES := external/sqlite/dist
 LOCAL_SHARED_LIBRARIES := libutils libsqlite libstagefright libmedia
 
-
 LOCAL_CFLAGS := -g
 LOCAL_LDFLAGS := -g
 
 include $(BUILD_EXECUTABLE)
+
+endif