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

Change-Id: I96fd376258e3bcd8357625373176ba53cdde12d0
diff --git a/android/main.c b/android/main.c
index ffa42aa..591e250 100644
--- a/android/main.c
+++ b/android/main.c
@@ -45,7 +45,7 @@
 
 #include "android/main-common.h"
 #include "android/help.h"
-#include "hw/goldfish_nand.h"
+#include "hw/android/goldfish/nand.h"
 
 #include "android/globals.h"