Fix library dependency/order

emulator-$ARCH depends on emulator-libqemu so fix their ordering.
Also qemu-char.c will soon contain arch-specific stuff so move it
to the appropriate location.

Change-Id: If74ae54128f80b0467297b97d74227b77f4916da

Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 5e21ccd..4fcc129 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -415,7 +415,6 @@
     iohandler.c \
     ioport.c \
     migration-dummy-android.c \
-    qemu-char.c \
     qemu-log.c \
     savevm.c \
     android/boot-properties.c \

Makefile.target

diff --git a/Makefile.target b/Makefile.target
index 5a29a48..fe5a338 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -281,8 +281,8 @@
 
 common_LOCAL_STATIC_LIBRARIES := \
     emulator-libui \
-    emulator-libqemu \
     emulator-target-$(EMULATOR_TARGET_CPU) \
+    emulator-libqemu \
     emulator-common \
     emulator-zlib
 
@@ -304,6 +304,7 @@
     dma-helpers.c \
     gdbstub.c \
     qdev-monitor-android.c \
+    qemu-char.c \
     qemu-timer.c \
     log-rotate-android.c \
     vl-android.c \
@@ -348,8 +349,8 @@
 $(call start-emulator-program, emulator-$(EMULATOR_TARGET_ARCH))
 LOCAL_STATIC_LIBRARIES += \
     emulator-libui \
-    emulator-libqemu \
     emulator-target-$(EMULATOR_TARGET_CPU) \
+    emulator-libqemu \
     emulator-libjpeg \
     emulator-common \
     emulator-libext4_utils \
@@ -379,8 +380,8 @@
 $(call start-emulator64-program, emulator64-$(EMULATOR_TARGET_ARCH))
 LOCAL_STATIC_LIBRARIES += \
     emulator64-libui \
-    emulator64-libqemu \
     emulator64-target-$(EMULATOR_TARGET_CPU) \
+    emulator64-libqemu \
     emulator64-libjpeg \
     emulator64-common \
     emulator64-libext4_utils \