Merge "Support booting a chained boot-debug.img" am: eabbfb9e81
am: d257f642df

Change-Id: I7fe51d419e066daef01d8cadcb504c71c39505f5