diff -r 1a6785e37d81 -r 74aaa564d5cc configs/common/FSConfig.py
--- a/configs/common/FSConfig.py	Wed Feb 11 10:23:47 2015 -0500
+++ b/configs/common/FSConfig.py	Thu Feb 19 17:51:54 2015 -0500
@@ -285,7 +285,9 @@
         self.gic_cpu_addr = self.realview.gic.cpu_addr
         self.flags_addr = self.realview.realview_io.pio_addr + 0x30
 
-        if mdesc.disk().lower().count('android'):
+        # Android disk images must have 'android' keyword in the disk name
+        # Look for 'android' in disk name and append /init to boot_osflags
+        if (os.path.split(mdesc.disk())[-1]).lower().count('android'):
             cmdline += " init=/init "
         self.boot_osflags = fillInCmdline(mdesc, cmdline)
     self.realview.attachOnChipIO(self.membus, self.bridge)