Move android-trace.h to include/android/

+ android-trace_common.h -> include/android/trace_common.h
  NOTE: trace_common.h is still in the top-level directory because
        the qtools first need to be updated to include the header
        at include/android/trace_common.h

+ trace.c -> android/
+ user-events.h -> include/android/
+ user-events-qemu.c -> android/

Change-Id: Idbf59c8b1a5cc2872f035eb3fa7f9922755f357d
diff --git a/Makefile.target b/Makefile.target
index f981ead..0cab90e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -167,7 +167,7 @@
     cpu-exec.c  \
     exec.c \
     translate-all.c \
-    trace.c \
+    android/trace.c \
     varint.c \
     softmmu_outside_jit.c
 
@@ -337,7 +337,6 @@
     monitor.c \
     qemu-timer.c \
     qemu-timer-common.c \
-    user-events-qemu.c \
     vl-android.c \
     android/console.c \
     android/opengles.c \
@@ -348,6 +347,7 @@
     android/protocol/ui-commands-proxy.c \
     android/protocol/core-commands-impl.c \
     android/protocol/core-commands-qemu.c \
+    android/user-events-qemu.c \
     ui/keymaps.c \
 
 $(call gen-hx-header,qemu-monitor.hx,qemu-monitor.h,monitor.c)
@@ -417,7 +417,6 @@
     monitor.c \
     qemu-timer.c \
     qemu-timer-common.c \
-    user-events-qemu.c \
     vl-android.c \
     android/cmdline-option.c \
     android/console.c \
@@ -429,6 +428,7 @@
     android/opengles.c \
     android/protocol/core-commands-qemu.c \
     android/protocol/ui-commands-qemu.c \
+    android/user-events-qemu.c \
     ui/keymaps.c \