Merge "Revert "Make the boot image non-debuggable.""