Move more headers.

cbuffer.h, charpipe.h -> include/android/
cbuffer.c, charpipe.c -> android/
qemu_debug.h -> include/android/qemu-debug.h
block.h, block_int.h -> include/block/
elf.h -> include/
hax.h -> include/exec/
qemu-lock.h -> include/exec/spinlock.h
readline.h -> include/monitor/readline.h
qemu-common.h - include
qemu-barrier.h -> include/qemu/atomic.h
qemu-log.h -> include/qemu/log.h

Change-Id: I86b998932461caa35d347cd71b40bd6e4ec7d84d
diff --git a/net/net.c b/net/net.c
index 7caf235..5a5bb05 100644
--- a/net/net.c
+++ b/net/net.c
@@ -118,7 +118,7 @@
 #include "qemu-char.h"
 #include "audio/audio.h"
 #include "qemu_socket.h"
-#include "qemu-log.h"
+#include "qemu/log.h"
 
 #if defined(CONFIG_SLIRP)
 #include "libslirp.h"