Merge "Re-enable boot image string sharpening."