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