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