Merge "Revert "Re-enable boot image string sharpening.""