hw/goldfish_* -> hw/android/goldfish/*

Change-Id: I96fd376258e3bcd8357625373176ba53cdde12d0
diff --git a/vl-android.c b/vl-android.c
index 446ac06..84c4154 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -36,7 +36,7 @@
 #include "hw/audiodev.h"
 #include "hw/isa/isa.h"
 #include "hw/baum.h"
-#include "hw/goldfish_nand.h"
+#include "hw/android/goldfish/nand.h"
 #include "net/net.h"
 #include "ui/console.h"
 #include "sysemu/sysemu.h"