Cleanup warnings in the standalone UI build

Change-Id: I2dc79f9d0b3916749366aa4155431420e05888c1
diff --git a/Makefile.android b/Makefile.android
index 3020429..c057585 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -635,7 +635,7 @@
 
 # misc. sources
 #
-CORE_MISC_SOURCES = \
+CORE_MISC_SOURCES = vl-android.c \
                     console.c \
                     loader.c \
                     monitor.c \
@@ -851,7 +851,6 @@
               android/cmdline-option.c \
               android/config.c \
               android/main.c \
-              vl-android.c
 
 # Add common system libraries
 #
@@ -1026,7 +1025,6 @@
 #
 VL_SOURCES := framebuffer.c \
               user-events-qemu.c \
-              vl-android.c
 
 # Add common system libraries
 #
@@ -1176,9 +1174,9 @@
               android/config.c \
               android/display.c \
               android/main.c \
-	      console-ui.c \
               qemu-timer-ui.c \
-              vl-android-ui.c
+              vl-android-ui.c \
+	          console-ui.c \
 
 # Add common system libraries
 #