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

Change-Id: I53946ed060f6060c7b5eb02602e33bd8764052f1