Even more moves.

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

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035
diff --git a/android/main.c b/android/main.c
index 332183a..1ca94df 100644
--- a/android/main.c
+++ b/android/main.c
@@ -23,7 +23,7 @@
 #include "android/android.h"
 #include "qemu-common.h"
 #include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
 #include "user-events.h"
 
 #include <SDL.h>