Even more moves.

  include/ui + ui/
  include/qapi/qmp/ + qobject/

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035
diff --git a/vl-android.c b/vl-android.c
index c519cd2..b33a958 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -38,7 +38,7 @@
 #include "hw/baum.h"
 #include "hw/goldfish_nand.h"
 #include "net.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "gdbstub.h"
 #include "qemu/timer.h"
@@ -189,7 +189,7 @@
 #include "bt-host.h"
 #include "net.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "gdbstub.h"
 #include "qemu/timer.h"