Merge "Move back the boot image to debuggable."